X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F12_uuid_support.patch;h=ed5191603b1549ad3ffde72c3c835eedd52713f3;hb=2045fef752eae3da560d21e557f08d87638f25ab;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..ed51916
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,35 +12,9 @@
 ## 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 ()
+--- a/scripts/boot/9990-misc-helpers.sh
++++ b/scripts/boot/9990-misc-helpers.sh
+@@ -20,6 +20,42 @@
  	return 1
  }
  
@@ -83,7 +57,7 @@ index abce3cd..851796c 100755
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1550,7 +1596,7 @@ check_dev ()
+@@ -247,7 +283,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -92,7 +66,7 @@ index abce3cd..851796c 100755
  		then
  			echo ${mountpoint}
  			return 0
-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -343,19 +379,6 @@
  					return 0
  				fi
  			done
@@ -112,3 +86,29 @@ index abce3cd..851796c 100755
  		fi
  	done
  
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -18,6 +18,11 @@
+ 				BOOTIF="${x#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