## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
+Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-misc-helpers.sh 2013-08-15 08:01:04.303981714 +0200
++++ live-boot-grml/scripts/boot/9990-misc-helpers.sh 2013-08-15 08:01:04.299981714 +0200
@@ -20,6 +20,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 ]
-@@ -247,7 +283,7 @@
+@@ -219,7 +255,7 @@
fi
if is_live_path ${mountpoint} && \
then
echo ${mountpoint}
return 0
-@@ -343,19 +379,6 @@
+@@ -315,19 +351,6 @@
return 0
fi
done
fi
done
---- a/scripts/boot/9990-cmdline-old
-+++ b/scripts/boot/9990-cmdline-old
+Index: live-boot-grml/scripts/boot/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-cmdline-old 2013-08-15 08:01:04.303981714 +0200
++++ live-boot-grml/scripts/boot/9990-cmdline-old 2013-08-15 08:01:04.299981714 +0200
@@ -18,6 +18,11 @@
- BOOTIF="${x#BOOTIF=}"
+ BOOTIF="${_PARAMETER#BOOTIF=}"
;;
+ bootid=*)