X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fdhcp;h=c4be30c40a79a8a1598711ee940b6f70f49c30ac;hb=22ec65898211b590bfbbf2f25c604169c456d15d;hp=083e0278c031cc55f6fbf5c457845e37d2cb78fd;hpb=f17590dbafa5f54b5f86d650ad64c8ce4d9173c2;p=hvlinux.git

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index 083e027..c4be30c 100644
--- 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 \
@@ -40,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