move reverts/restores of old upstream behaviour to an own subdir

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

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
index dbffc7c..65b72be 100644 (file)
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,10 +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.
 

---- a/scripts/live
-+++ b/scripts/live
-@@ -220,6 +220,11 @@
-                               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)
                                ;;
  
 +                      nodhcphostname)


@@ -22,6 +24,6 @@ This patch takes care of the netboot case.
 +                              export NODHCPHOSTNAME
 +                              ;;
 +
 +                              export NODHCPHOSTNAME
 +                              ;;
 +

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