changelog entry

[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 67f05c4..646a19c 100644 (file)
--- 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/components/9990-misc-helpers.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-misc-helpers.sh        2014-03-08 13:25:32.293262071 +0100
++++ live-boot-grml/components/9990-misc-helpers.sh     2014-03-08 13:25:32.289262541 +0100
+@@ -15,6 +15,42 @@
        return 1
  }
  
@@ -23,12 +25,12 @@
 +      path="$1"
 +
 +      if [ -n "$IGNORE_BOOTID" ] ; then
-+              echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/live-boot.log
++              echo " * Ignoring verification of bootid.txt as requested via ignore_bootid.">>/boot.log
 +              return 0
 +      fi
 +
 +      if [ -n "$BOOTID" ] && ! [ -r "${path}/conf/bootid.txt" ] ; then
-+              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/live-boot.log
++              echo "  * Warning: bootid=... specified but no bootid.txt found on currently requested device.">>/boot.log
 +              return 1
 +      fi
 +
@@ -38,15 +40,15 @@
 +
 +      if [ -z "$BOOTID" -a -z "$IGNORE_BOOTID" ]
 +      then
-+              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/live-boot.log
++              echo " * Warning: bootid.txt found but ignore_bootid / bootid=.. bootoption missing...">>/boot.log
 +              return 1
 +      fi
 +
 +      if [ "$BOOTID" = "$bootid_conf" ]
 +      then
-+              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/live-boot.log
++              echo " * Successfully verified /conf/bootid.txt from ISO, continuing... ">>/boot.log
 +      else
-+              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/live-boot.log
++              echo " * Warning: BOOTID of ISO does not match. Retrying and continuing search...">>/boot.log
 +              return 1
 +      fi
 +
@@ -57,7 +59,7 @@
  matches_uuid ()
  {
        if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1350,7 +1386,7 @@
+@@ -214,7 +250,7 @@
                fi
  
                if is_live_path ${mountpoint} && \
@@ -66,7 +68,7 @@
                then
                        echo ${mountpoint}
                        return 0
-@@ -1446,19 +1482,6 @@
+@@ -310,19 +346,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/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:25:32.293262071 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:25:32.289262541 +0100
 @@ -18,6 +18,11 @@
-                               BOOTIF="${x#BOOTIF=}"
+                               BOOTIF="${_PARAMETER#BOOTIF=}"
                                ;;
  
 +                      bootid=*)