## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
---- a/scripts/live
-+++ b/scripts/live
-@@ -52,6 +52,42 @@
+--- a/scripts/boot/9990-misc-helpers.sh
++++ b/scripts/boot/9990-misc-helpers.sh
+@@ -20,6 +20,42 @@
return 1
}
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1350,7 +1386,7 @@
+@@ -247,7 +283,7 @@
fi
if is_live_path ${mountpoint} && \
then
echo ${mountpoint}
return 0
-@@ -1446,19 +1482,6 @@
+@@ -343,19 +379,6 @@
return 0
fi
done
fi
done
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -45,6 +45,11 @@
- export ACCESS
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -18,6 +18,11 @@
+ BOOTIF="${x#BOOTIF=}"
;;
+ bootid=*)
-+ BOOTID="${ARGUMENT#bootid=}"
++ BOOTID="${_PARAMETER#bootid=}"
+ export BOOTID
+ ;;
+
- console=*)
- DEFCONSOLE="${ARGUMENT#*=}"
- export DEFCONSOLE
-@@ -126,6 +131,11 @@
+ dhcp)
+ # Force dhcp even while netbooting
+ # Use for debugging in case somebody works on fixing dhclient
+@@ -79,6 +84,11 @@
export FROMISO
;;
+ ;;
+
ignore_uuid)
- IGNORE_UUID="Yes"
+ IGNORE_UUID="true"
export IGNORE_UUID