X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fbootscripts%2Fnetwork;h=d82e9eea876f8b94a42bd687bb209b2b1b35226e;hb=26aae117426a9e1273895624aaf172a8a8444d95;hp=11c273a4a20aa6f76bdc3619bbf49007fd2c3730;hpb=52af66bca3ef20db87fbc3c47d852b21ae9fd219;p=hvlinux.git

diff --git a/stage2/bootscripts/network b/stage2/bootscripts/network
index 11c273a..d82e9ee 100755
--- a/stage2/bootscripts/network
+++ b/stage2/bootscripts/network
@@ -62,6 +62,21 @@ network_start()
     fi
 }
 
+if [ x"${DNS_SERVER_ENA}" == xyes ]; then
+    cat > /etc/dhclient-enter-hooks << "EOF"
+# If named is running, do not let dhclient create or modify resolv.conf
+# by specifying an empty function hook:
+make_resolv_conf(){
+	:
+}
+EOF
+    chmod u+x /etc/dhclient-enter-hooks
+else
+    if [ -f /etc/dhclient-enter-hooks ]; then
+        rm /etc/dhclient-enter-hooks
+    fi
+fi
+
 # See how we were called.
 case "$1" in
     start)