X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F12_uuid_support.patch;h=646a19c4beca6eff738d51664d774bbcd86b3c40;hb=fdf285d157bf1558728e0b6b6bea3b4f78a7b108;hp=ed5191603b1549ad3ffde72c3c835eedd52713f3;hpb=895b356b249e9b1196d180a43c2e6601fab1b158;p=live-boot-grml.git

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index ed51916..646a19c 100644
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,9 +12,11 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
---- a/scripts/boot/9990-misc-helpers.sh
-+++ b/scripts/boot/9990-misc-helpers.sh
-@@ -20,6 +20,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
  }
  
@@ -23,12 +25,12 @@
 +	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
 +
@@ -38,15 +40,15 @@
 +
 +	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
 +
@@ -57,7 +59,7 @@
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -247,7 +283,7 @@
+@@ -214,7 +250,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -66,7 +68,7 @@
  		then
  			echo ${mountpoint}
  			return 0
-@@ -343,19 +379,6 @@
+@@ -310,19 +346,6 @@
  					return 0
  				fi
  			done
@@ -86,10 +88,12 @@
  		fi
  	done
  
---- a/scripts/boot/9990-cmdline-old
-+++ b/scripts/boot/9990-cmdline-old
+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="${x#BOOTIF=}"
+ 				BOOTIF="${_PARAMETER#BOOTIF=}"
  				;;
  
 +			bootid=*)