projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log to boot.log, not live-boot.log
[live-boot-grml.git]
/
debian
/
patches
/
12_uuid_support.patch
diff --git
a/debian/patches/12_uuid_support.patch
b/debian/patches/12_uuid_support.patch
index
810e811
..
13d4ebe
100644
(file)
--- a/
debian/patches/12_uuid_support.patch
+++ b/
debian/patches/12_uuid_support.patch
@@
-25,12
+25,12
@@
Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
+ path="$1"
+
+ if [ -n "$IGNORE_BOOTID" ] ; then
+ 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
+ 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
+
+ return 1
+ fi
+
@@
-40,15
+40,15
@@
Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
+
+ if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
+ then
+
+ 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
+ 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
+ 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
+
+ return 1
+ fi
+