Date: Mon, 19 Jan 2015 18:36:11 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277394 - projects/release-vmimage/release/tools Message-ID: <201501191836.t0JIaBGM073606@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Jan 19 18:36:10 2015 New Revision: 277394 URL: https://svnweb.freebsd.org/changeset/base/277394 Log: Move resolv.conf(5) removal back to vm_extra_pre_umount() where it belongs. The GCE image needs resolv.conf(5) to exist (created as part of the image setup), so it cannot be removed. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/tools/vmimage.subr Modified: projects/release-vmimage/release/tools/vmimage.subr ============================================================================== --- projects/release-vmimage/release/tools/vmimage.subr Mon Jan 19 18:17:21 2015 (r277393) +++ projects/release-vmimage/release/tools/vmimage.subr Mon Jan 19 18:36:10 2015 (r277394) @@ -146,6 +146,7 @@ vm_extra_pre_umount() { # Prototype. When overridden, installs additional ports within the # virtual machine environment. + rm -f ${DESTDIR}/etc/resolv.conf return 0 } @@ -154,7 +155,6 @@ vm_extra_pkg_rmcache() { chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/local/sbin/pkg clean -y -a fi - rm -f ${DESTDIR}/etc/resolv.conf return 0 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501191836.t0JIaBGM073606>