Refresh debian/patches/ against new upstream code

[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..3d66672 100644 (file)
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -14,31 +14,7 @@
 @DPATCH@
 --- a/scripts/live
 +++ b/scripts/live
-@@ -63,6 +63,11 @@
-                               export ACCESS
-                               ;;
- 
-+                      bootid=*)
-+                              BOOTID="${ARGUMENT#bootid=}"
-+                              export BOOTID
-+                              ;;
-+
-                       console=*)
-                               DEFCONSOLE="${ARGUMENT#*=}"
-                               export DEFCONSOLE
-@@ -144,6 +149,11 @@
-                               export FROMISO
-                               ;;
- 
-+                      ignore_bootid)
-+                              IGNORE_BOOTID="Yes"
-+                              export IGNORE_BOOTID
-+                              ;;
-+
-                       ignore_uuid)
-                               IGNORE_UUID="Yes"
-                               export IGNORE_UUID
-@@ -410,6 +420,42 @@
+@@ -52,6 +52,42 @@
        return 1
  }
  
@@ -81,7 +57,7 @@
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1655,7 +1701,7 @@
+@@ -1350,7 +1386,7 @@
                fi
  
                if is_live_path ${mountpoint} && \
@@ -90,7 +66,7 @@
                then
                        echo ${mountpoint}
                        return 0
-@@ -1769,19 +1815,6 @@
+@@ -1446,19 +1482,6 @@
                                        return 0
                                fi
                        done
@@ -110,3 +86,29 @@
                fi
        done
  
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -45,6 +45,11 @@
+                               export ACCESS
+                               ;;
+ 
++                      bootid=*)
++                              BOOTID="${ARGUMENT#bootid=}"
++                              export BOOTID
++                              ;;
++
+                       console=*)
+                               DEFCONSOLE="${ARGUMENT#*=}"
+                               export DEFCONSOLE
+@@ -126,6 +131,11 @@
+                               export FROMISO
+                               ;;
+ 
++                      ignore_bootid)
++                              IGNORE_BOOTID="Yes"
++                              export IGNORE_BOOTID
++                              ;;
++
+                       ignore_uuid)
+                               IGNORE_UUID="Yes"
+                               export IGNORE_UUID