## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
---- a/scripts/live
-+++ b/scripts/live
-@@ -63,6 +63,11 @@
- export ACCESS
- ;;
-
-+ bootid=*)
-+ BOOTID="${ARGUMENT#bootid=}"
-+ export BOOTID
-+ ;;
-+
- console=*)
- DEFCONSOLE="${ARGUMENT#*=}"
- export DEFCONSOLE
-@@ -144,6 +149,11 @@
- export FROMISO
- ;;
-
-+ ignore_bootid)
-+ IGNORE_BOOTID="Yes"
-+ export IGNORE_BOOTID
-+ ;;
-+
- ignore_uuid)
- IGNORE_UUID="Yes"
- export IGNORE_UUID
-@@ -410,6 +420,42 @@
+Index: live-boot-grml/components/9990-misc-helpers.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-misc-helpers.sh 2014-03-08 13:25:32.293262071 +0100
++++ live-boot-grml/components/9990-misc-helpers.sh 2014-03-08 13:25:32.289262541 +0100
+@@ -15,6 +15,42 @@
return 1
}
+ path="$1"
+
+ if [ -n "$IGNORE_BOOTID" ] ; then
-+ echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/live-boot.log
++ echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/boot.log
+ return 0
+ fi
+
+ if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
-+ echo " * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live-boot.log
++ echo " * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/boot.log
+ return 1
+ fi
+
+
+ if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
+ then
-+ echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live-boot.log
++ echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/boot.log
+ return 1
+ fi
+
+ if [ "$BOOTID" = "$bootid_conf" ]
+ then
-+ echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live-boot.log
++ echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/boot.log
+ else
-+ echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live-boot.log
++ echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/boot.log
+ return 1
+ fi
+
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1655,7 +1701,7 @@
+@@ -214,7 +250,7 @@
fi
if is_live_path ${mountpoint} && \
then
echo ${mountpoint}
return 0
-@@ -1769,19 +1815,6 @@
+@@ -310,19 +346,6 @@
return 0
fi
done
fi
done
+Index: live-boot-grml/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old 2014-03-08 13:25:32.293262071 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:25:32.289262541 +0100
+@@ -18,6 +18,11 @@
+ BOOTIF="${_PARAMETER#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