From: Daniel Hokka Zakrisson Date: Sat, 28 Nov 2009 05:51:17 +0000 (+0000) Subject: Use the host's /etc/resolv.conf by default. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8f5839c759113a738c058b90344ab54cfda3cf;p=util-vserver.git Use the host's /etc/resolv.conf by default. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2865 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/scripts/vserver-build.functions b/scripts/vserver-build.functions index 1df67e5..55ee043 100644 --- a/scripts/vserver-build.functions +++ b/scripts/vserver-build.functions @@ -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