X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F12_uuid_support.patch;h=810e8116275b16be0e35b06db546c5857c2b8fc1;hb=eae42969c6f684a71e2aa812eaa449f3e64a33fc;hp=67f05c471552f119088b648a934e00e1549e9306;hpb=b5809b75c8aabfef185edb36f141019e69f8b3de;p=live-boot-grml.git

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 67f05c4..810e811 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
-@@ -52,6 +52,42 @@
+Index: live-boot-grml/scripts/boot/9990-misc-helpers.sh
+===================================================================
+--- 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
  }
  
@@ -57,7 +59,7 @@
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1350,7 +1386,7 @@
+@@ -219,7 +255,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -66,7 +68,7 @@
  		then
  			echo ${mountpoint}
  			return 0
-@@ -1446,19 +1482,6 @@
+@@ -315,19 +351,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/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="${x#BOOTIF=}"
+ 				BOOTIF="${_PARAMETER#BOOTIF=}"
  				;;
  
 +			bootid=*)