X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F12_uuid_support.patch;h=13d4ebe827ac6f1ed0cb454978971888c111adfa;hb=c06cdf4200961e9fcf9a3c785e3da7bc7ee9604d;hp=f241bbadb8b4f4dd21db566f09851da83622e310;hpb=11575c6aee0916c918b1e4e98731566d20586df9;p=live-boot-grml.git

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index f241bba..13d4ebe 100644
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,35 +12,11 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
-Index: live-boot-grml/scripts/live
+Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
 ===================================================================
---- live-boot-grml.orig/scripts/live	2011-12-06 22:10:24.000000000 +0100
-+++ live-boot-grml/scripts/live	2011-12-06 22:10:25.000000000 +0100
-@@ -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
-@@ -457,6 +467,42 @@
+--- 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
  }
  
@@ -49,12 +25,12 @@ Index: live-boot-grml/scripts/live
 +	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
 +
@@ -64,15 +40,15 @@ Index: live-boot-grml/scripts/live
 +
 +	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
 +
@@ -83,7 +59,7 @@ Index: live-boot-grml/scripts/live
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1785,7 +1831,7 @@
+@@ -219,7 +255,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -92,7 +68,7 @@ Index: live-boot-grml/scripts/live
  		then
  			echo ${mountpoint}
  			return 0
-@@ -1881,19 +1927,6 @@
+@@ -315,19 +351,6 @@
  					return 0
  				fi
  			done
@@ -112,3 +88,31 @@ Index: live-boot-grml/scripts/live
  		fi
  	done
  
+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="${_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