X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F12_uuid_support.patch;h=f241bbadb8b4f4dd21db566f09851da83622e310;hb=87a8e76b3aa1cd84a70fe5a9554e86bb80d54701;hp=0a606120a61c535d761b966fbe2d7b4b51e49df7;hpb=6ac1aac5fcd96ce1e986e64884bd8c16a7aa9ea8;p=live-boot-grml.git

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 0a60612..f241bba 100644
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,10 +12,10 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
-Index: b/scripts/live
+Index: live-boot-grml/scripts/live
 ===================================================================
---- a/scripts/live	2011-07-24 22:08:02.000000000 +0200
-+++ b/scripts/live	2011-07-24 22:08:03.000000000 +0200
+--- 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
  				;;
@@ -40,7 +40,7 @@ Index: b/scripts/live
  			ignore_uuid)
  				IGNORE_UUID="Yes"
  				export IGNORE_UUID
-@@ -410,6 +420,42 @@
+@@ -457,6 +467,42 @@
  	return 1
  }
  
@@ -83,7 +83,7 @@ Index: b/scripts/live
  matches_uuid ()
  {
  	if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1655,7 +1701,7 @@
+@@ -1785,7 +1831,7 @@
  		fi
  
  		if is_live_path ${mountpoint} && \
@@ -92,7 +92,7 @@ Index: b/scripts/live
  		then
  			echo ${mountpoint}
  			return 0
-@@ -1769,19 +1815,6 @@
+@@ -1881,19 +1927,6 @@
  					return 0
  				fi
  			done