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

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index 5f640d4..1cb301a 100644
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -41,6 +41,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