Merge branch 'debian'

[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..965b3ac
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,12 +11,10 @@ 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.
 

-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
+--- a/scripts/boot/9990-cmdline-old
++++ b/scripts/boot/9990-cmdline-old
+@@ -140,6 +140,11 @@ Cmdline_old ()
+                               export NFS_COW

                                ;;
  
 +                      nodhcphostname)
                                ;;
  
 +                      nodhcphostname)


@@ -24,7 +22,6 @@ index 9554b77..9270e9c 100755
 +                              export NODHCPHOSTNAME
 +                              ;;
 +
 +                              export NODHCPHOSTNAME
 +                              ;;
 +

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