Turn d4619b77 into a quilt patch

[live-boot-grml.git] / debian / patches / 12_uuid_support.patch

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