X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fdhcp;h=083e0278c031cc55f6fbf5c457845e37d2cb78fd;hb=8a12114ecc9a0f7d97ab543785a1a758ea4d0973;hp=5f640d48a68e490299beefa57ab322944769ccde;hpb=5a9383dc799ad6e7ede2c1e8397bc0987969239f;p=hvlinux.git

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index 5f640d4..083e027 100644
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -32,7 +32,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,6 +40,15 @@ 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