Use the host's /etc/resolv.conf by default.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Sat, 28 Nov 2009 05:51:17 +0000 (05:51 +0000)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Sat, 28 Nov 2009 05:51:17 +0000 (05:51 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2865 94cd875c-1c1d-0410-91d2-eb244daf1a30

scripts/vserver-build.functions

index 1df67e5..55ee043 100644 (file)
@@ -222,9 +222,11 @@ WARNING: could not set the barrier attribute on '$VDIR/..',
     findAndCopy "$VDIR"/etc/hosts         "$__CONFDIR"/.defaults/files/hosts "$__CONFDIR/.distributions/$DISTRIBUTION"/files/hosts \
                                          "$__DISTRIBDIR/$DISTRIBUTION"/files/hosts "$__DISTRIBDIR"/defaults/files/hosts ""
 
-    for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime resolv.conf; do
+    for i in nsswitch.conf krb5.conf krb.conf krb.realms ldap.conf localtime; do
        findAndCopy "$VDIR"/etc/$i  "$__CONFDIR/.defaults/files/$i" "$__CONFDIR/.distributions/$DISTRIBUTION/files/$i" ""
     done
+    findAndCopy "$VDIR"/etc/resolv.conf "$__CONFDIR/.defaults/files/resolv.conf" \
+       "$__CONFDIR/.distributions/$DISTRIBUTION/files/resolv.conf" /etc/resolv.conf ""
 }
 
 function base._initVariables