## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
-diff --git a/scripts/live b/scripts/live
-index abce3cd..851796c 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -63,6 +63,11 @@ Arguments ()
- export ACCESS
- ;;
-
-+ bootid=*)
-+ BOOTID="${ARGUMENT#bootid=}"
-+ export BOOTID
-+ ;;
-+
- console=*)
- DEFCONSOLE="${ARGUMENT#*=}"
- export DEFCONSOLE
-@@ -140,6 +145,11 @@ Arguments ()
- export FROMISO
- ;;
-
-+ ignore_bootid)
-+ IGNORE_BOOTID="Yes"
-+ export IGNORE_BOOTID
-+ ;;
-+
- ignore_uuid)
- IGNORE_UUID="Yes"
- export IGNORE_UUID
-@@ -392,6 +402,42 @@ is_live_path ()
+--- a/scripts/boot/9990-misc-helpers.sh
++++ b/scripts/boot/9990-misc-helpers.sh
+@@ -52,6 +52,42 @@
return 1
}
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1550,7 +1596,7 @@ check_dev ()
+@@ -1350,7 +1386,7 @@
fi
if is_live_path ${mountpoint} && \
then
echo ${mountpoint}
return 0
-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -1446,19 +1482,6 @@
return 0
fi
done
fi
done
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -18,6 +18,11 @@
+ BOOTIF="${x#BOOTIF=}"
+ ;;
+
++ bootid=*)
++ BOOTID="${_PARAMETER#bootid=}"
++ export BOOTID
++ ;;
++
+ dhcp)
+ # Force dhcp even while netbooting
+ # Use for debugging in case somebody works on fixing dhclient
+@@ -79,6 +84,11 @@
+ export FROMISO
+ ;;
+
++ ignore_bootid)
++ IGNORE_BOOTID="Yes"
++ export IGNORE_BOOTID
++ ;;
++
+ ignore_uuid)
+ IGNORE_UUID="true"
+ export IGNORE_UUID