Merge dhcphostname support into 23networking-grml

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

diff --git a/debian/patches/11_dhcphostname.dpatch b/debian/patches/11_dhcphostname.dpatch
index 69b9d69..162aa56 100755 (executable)
--- a/debian/patches/11_dhcphostname.dpatch
+++ b/debian/patches/11_dhcphostname.dpatch
@@ -13,28 +13,6 @@ 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-bottom/23networking
-+++ b/scripts/live-bottom/23networking
-@@ -135,6 +135,19 @@ ${rc_server1}
- EOF
- 
-                       cat /root/etc/resolv.conf >> /root/var/log/netboot.config
-+
-+                      if [ -z "$NODHCPHOSTNAME" ]
-+                      then
-+                              dhcp_address=$(cat netboot.config | awk '/address:/{print $2}')
-+                              dhcp_hostname=$(busybox nslookup ${dhcp_address} ${rc_server0#nameserver }| awk \
-+                                      '/Address 1: '${dhcp_address}'/{ print $4 }')
-+
-+                              if [ -n "$dhcp_hostname" ]
-+                              then
-+                                      echo $dhcp_hostname > /root/etc/hostname
-+                              fi
-+                              unset dhcp_address dhcp_hostname dhcp_hostname
-+                      fi
-               fi
-       fi
- fi
 --- a/scripts/live
 +++ b/scripts/live
 @@ -216,6 +216,11 @@ Arguments ()