Date: Mon, 24 Nov 2014 02:34:02 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274945 - projects/release-vmimage/release/tools Message-ID: <201411240234.sAO2Y2Sx041268@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Nov 24 02:34:01 2014 New Revision: 274945 URL: https://svnweb.freebsd.org/changeset/base/274945 Log: In vm_extra_install_packages(), only bootstrap pkg(8) if VM_EXTRA_PACKAGES is empty. In vm_extra_pre_umount(), cleanup downloaded packages if pkg(8) was bootstrapped earlier. Inspired by: cperciva 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 Nov 24 01:59:08 2014 (r274944) +++ projects/release-vmimage/release/tools/vmimage.subr Mon Nov 24 02:34:01 2014 (r274945) @@ -114,14 +114,15 @@ vm_extra_enable_services() { } vm_extra_install_packages() { + if [ -z "${VM_EXTRA_PACKAGES}" ]; then + return 0 + fi mkdir -p ${DESTDIR}/dev mount -t devfs devfs ${DESTDIR}/dev chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg bootstrap -y - if [ ! -z "${VM_EXTRA_PACKAGES}" ]; then chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \ /usr/sbin/pkg install -y ${VM_EXTRA_PACKAGES} - fi umount ${DESTDIR}/dev return 0 @@ -138,6 +139,10 @@ vm_extra_pre_umount() { # Prototype. When overridden, installs additional ports within the # virtual machine environment. + if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then + 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?201411240234.sAO2Y2Sx041268>