diff --git a/helpers/DATA/casper/remove_interactive_netmount.patch b/helpers/DATA/casper/remove_interactive_netmount.patch new file mode 100644 index 0000000000000000000000000000000000000000..fe2dbb552387ecb7618c058ec2238610a1ce3fc8 --- /dev/null +++ b/helpers/DATA/casper/remove_interactive_netmount.patch @@ -0,0 +1,15 @@ +--- a/scripts/casper 2022-05-30 09:40:38.000000000 -0500 ++++ b/scripts/casper 2023-02-13 23:47:27.515797105 -0600 +@@ -955,12 +955,6 @@ + sleep 1 + i="$(($i + 1))" + done +- +- if [ -z "${livefs_root}" ]; then +- if do_interactive_netmount ; then +- livefs_root="${mountpoint}" +- fi +- fi + fi + + if [ -z "${livefs_root}" ]; then diff --git a/helpers/make-casper b/helpers/make-casper index da8279291872cb0f9ec24aded44854fb7417497f..a6b43ca7c83bc13b0668537035ac7f2b5cf49bfc 100644 --- a/helpers/make-casper +++ b/helpers/make-casper @@ -1,6 +1,7 @@ #!/bin/sh # -# Copyright (C) 2012-2022 Ruben Rodriguuez <ruben@trisquel.info> +# Copyright (C) 2012-2022 Ruben Rodriguez <ruben@trisquel.info> +# Copyright (C) 2023 Luis Guzmán <ark@switnet.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=15 +VERSION=16 . ./config @@ -42,7 +43,9 @@ sed 's/Depends:/Depends: localechooser-data,\n/' -i debian/control sed "s/cut/cut -d: -f2- | cut/" -i scripts/casper-functions sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions +#Remove ubuntu's net images load on empty livefs. +patch -p1 < $DATA/remove_interactive_netmount.patch + changelog "Compiled for Trisquel" compile -