X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpatches%2F12_uuid_support.patch;h=ed5191603b1549ad3ffde72c3c835eedd52713f3;hb=b7de9b2aefed4cdc19ba39437634e5ccef992410;hp=3d66672b9d8401dbe1dcd99d80f664854dbcdb61;hpb=91460b9cb497f74c444cf57ef237311124c1eb90;p=live-boot-grml.git

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 3d66672..ed51916 100644
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,9 +12,9 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
-@@ -52,6 +52,42 @@
+--- a/scripts/boot/9990-misc-helpers.sh
++++ b/scripts/boot/9990-misc-helpers.sh
+@@ -20,6 +20,42 @@
  	return 1
  }
  
@@ -57,7 +57,7 @@
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1350,7 +1386,7 @@
+@@ -247,7 +283,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -66,7 +66,7 @@
  		then
  			echo ${mountpoint}
  			return 0
-@@ -1446,19 +1482,6 @@
+@@ -343,19 +379,6 @@
  					return 0
  				fi
  			done
@@ -86,21 +86,21 @@
  		fi
  	done
  
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -45,6 +45,11 @@
- 				export ACCESS
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -18,6 +18,11 @@
+ 				BOOTIF="${x#BOOTIF=}"
  				;;
  
 +			bootid=*)
-+				BOOTID="${ARGUMENT#bootid=}"
++				BOOTID="${_PARAMETER#bootid=}"
 +				export BOOTID
 +				;;
 +
- 			console=*)
- 				DEFCONSOLE="${ARGUMENT#*=}"
- 				export DEFCONSOLE
-@@ -126,6 +131,11 @@
+ 			dhcp)
+ 				# Force dhcp even while netbooting
+ 				# Use for debugging in case somebody works on fixing dhclient
+@@ -79,6 +84,11 @@
  				export FROMISO
  				;;
  
@@ -110,5 +110,5 @@
 +				;;
 +
  			ignore_uuid)
- 				IGNORE_UUID="Yes"
+ 				IGNORE_UUID="true"
  				export IGNORE_UUID