Fix udev naming of eth* network interfaces

[hvlinux.git] / stage2 / pkg / dhcp

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index 1cb301a..c4be30c 100644 (file)
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -5,8 +5,7 @@ hvconfig_pre()
     cd ${LFS_TMP}/${PACKAGE}
     sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --localstatedir=/var \
         --sbindir=/sbin \
         --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
@@ -32,7 +31,6 @@ timeout 15;
 
 interface "eth0"{
   supersede domain-name "_DOMAIN_";
-  prepend domain-name-servers 127.0.0.1;
   request subnet-mask, broadcast-address, time-offset, routers,
           domain-name, domain-name-servers, host-name;
   require subnet-mask, domain-name-servers;
@@ -41,15 +39,6 @@ EOF
 
     sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /etc/dhclient.conf
 
-    cat > /etc/dhclient-enter-hooks << "EOF"
-# If named is running, do not let dhclient create or modify resolv.conf
-# by specifyng an empty function hook:
-make_resolv_conf(){
-       :
-}
-EOF
-    chmod u+x /etc/dhclient-enter-hooks
-
     cat > /etc/sysconfig/network/dhcp-client << "EOF"
 # dhcp-client
 # DHCP client program informations