refresh 26_support_dns_bootoption.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
old mode 100755 (executable)
new mode 100644 (file)
index a8e6ccc..810e811
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,35 +12,11 @@
 ## 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 ()
+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
  }
  
@@ -83,7 +59,7 @@ index abce3cd..851796c 100755
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1550,7 +1596,7 @@ check_dev ()
+@@ -219,7 +255,7 @@
                fi
  
                if is_live_path ${mountpoint} && \
@@ -92,7 +68,7 @@ index abce3cd..851796c 100755
                then
                        echo ${mountpoint}
                        return 0
-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -315,19 +351,6 @@
                                        return 0
                                fi
                        done
@@ -112,3 +88,31 @@ index abce3cd..851796c 100755
                fi
        done
  
+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="${_PARAMETER#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