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
index c00a8b8..65b72be 100644 (file)
--- 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.
 
 hostname of the booted system according to the DNS information.
 This patch takes care of the netboot case.
 

-Index: b/scripts/live
+Index: live-boot-grml/components/9990-cmdline-old

 ===================================================================
 ===================================================================

---- a/scripts/live     2011-07-24 22:07:59.000000000 +0200
-+++ b/scripts/live     2011-07-24 22:08:02.000000000 +0200
-@@ -220,6 +220,11 @@
-                               export NOACCESSIBILITY
+--- 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)
                                ;;
  
 +                      nodhcphostname)


@@ -24,6 +24,6 @@ Index: b/scripts/live
 +                              export NODHCPHOSTNAME
 +                              ;;
 +
 +                              export NODHCPHOSTNAME
 +                              ;;
 +

-                       nofastboot)
-                               NOFASTBOOT="Yes"
-                               export NOFASTBOOT
+                       nofstab)
+                               NOFSTAB="true"
+                               export NOFSTAB