Refresh patches against current master

[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..965b3ac 100644 (file)
--- 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.
 

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

                                ;;
  
 +                      nodhcphostname)
                                ;;
  
 +                      nodhcphostname)


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

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