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

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
old mode 100755
new mode 100644
index a8e6ccc..646a19c
--- 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@
-diff --git a/scripts/live b/scripts/live
-index abce3cd..851796c 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -63,6 +63,11 @@ Arguments ()
- 				export ACCESS
- 				;;
- 
-+			bootid=*)
-+				BOOTID="${ARGUMENT#bootid=}"
-+				export BOOTID
-+				;;
-+
- 			console=*)
- 				DEFCONSOLE="${ARGUMENT#*=}"
- 				export DEFCONSOLE
-@@ -140,6 +145,11 @@ Arguments ()
- 				export FROMISO
- 				;;
- 
-+			ignore_bootid)
-+				IGNORE_BOOTID="Yes"
-+				export IGNORE_BOOTID
-+				;;
-+
- 			ignore_uuid)
- 				IGNORE_UUID="Yes"
- 				export IGNORE_UUID
-@@ -392,6 +402,42 @@ is_live_path ()
+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
  }
  
@@ -49,12 +25,12 @@ index abce3cd..851796c 100755
 +	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 abce3cd..851796c 100755
 +
 +	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 abce3cd..851796c 100755
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1550,7 +1596,7 @@ check_dev ()
+@@ -214,7 +250,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -92,7 +68,7 @@ index abce3cd..851796c 100755
  		then
  			echo ${mountpoint}
  			return 0
-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -310,19 +346,6 @@
  					return 0
  				fi
  			done
@@ -112,3 +88,31 @@ index abce3cd..851796c 100755
  		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