update our patches on top of Debian's 4.0~alpha19

[live-boot-grml.git] / debian / patches / 11_dhcphostname.patch

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
old mode 100755 (executable)
new mode 100644 (file)
index 162aa56..65b72be
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,12 +11,12 @@ Support 'nodhcphostname' option which will disable setting the
 hostname of the booted system according to the DNS information.
 This patch takes care of the netboot case.
 
-diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
-index 9554b77..9270e9c 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -216,6 +216,11 @@ Arguments ()
-                               export NOACCESSIBILITY
+Index: live-boot-grml/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old    2014-03-08 13:21:20.186833068 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:21:20.182833537 +0100
+@@ -140,6 +140,11 @@
+                               export NFS_COW
                                ;;
  
 +                      nodhcphostname)
@@ -24,7 +24,6 @@ index 9554b77..9270e9c 100755
 +                              export NODHCPHOSTNAME
 +                              ;;
 +
-                       nofastboot)
-                               NOFASTBOOT="Yes"
-                               export NOFASTBOOT
-
+                       nofstab)
+                               NOFSTAB="true"
+                               export NOFSTAB