From owner-svn-src-projects@FreeBSD.ORG Thu Oct 9 04:10:59 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F46F8C6; Thu, 9 Oct 2014 04:10:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31CB9D1C; Thu, 9 Oct 2014 04:10:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s994AxxZ016809; Thu, 9 Oct 2014 04:10:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s994Aw1S016806; Thu, 9 Oct 2014 04:10:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201410090410.s994Aw1S016806@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 9 Oct 2014 04:10:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272795 - in projects/release-vmimage/release: amd64 i386 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2014 04:10:59 -0000 Author: gjb Date: Thu Oct 9 04:10:58 2014 New Revision: 272795 URL: https://svnweb.freebsd.org/changeset/base/272795 Log: Reference vm_prebuild_setup(), vm_setup(), and vm_postbuild_setup() functions. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh projects/release-vmimage/release/i386/mk-vmimage.sh Modified: projects/release-vmimage/release/amd64/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 03:50:38 2014 (r272794) +++ projects/release-vmimage/release/amd64/mk-vmimage.sh Thu Oct 9 04:10:58 2014 (r272795) @@ -92,6 +92,9 @@ panic() { } vm_create_baseimage() { + # Run anything that is needed before the virtual machine disk image + # is created. + vm_prebuild_setup # Creates the UFS root filesystem for the virtual machine disk, # written to the formatted disk image with mkimg(1). # @@ -125,6 +128,9 @@ vm_create_baseimage() { >> ${DESTDIR}/etc/fstab echo '/dev/gpt/swapfs none swap sw 0 0' \ >> ${DESTDIR}/etc/fstab + # Run anything that is needed while the virtual machine disk image + # userland filesystem is still mounted as a md(4) device. + vm_setup sync while ! umount ${DESTDIR}; do i=$(( $i + 1 )) @@ -184,6 +190,9 @@ vm_create_vmdisk() { -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} + # Run anything that is needed for the virtual machine disk image + # after it has been created. + vm_postbuild_setup return 0 } Modified: projects/release-vmimage/release/i386/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 03:50:38 2014 (r272794) +++ projects/release-vmimage/release/i386/mk-vmimage.sh Thu Oct 9 04:10:58 2014 (r272795) @@ -92,6 +92,9 @@ panic() { } vm_create_baseimage() { + # Run anything that is needed before the virtual machine disk image + # is created. + vm_prebuild_setup # Creates the UFS root filesystem for the virtual machine disk, # written to the formatted disk image with mkimg(1). # @@ -125,6 +128,9 @@ vm_create_baseimage() { >> ${DESTDIR}/etc/fstab echo '/dev/gpt/swapfs none swap sw 0 0' \ >> ${DESTDIR}/etc/fstab + # Run anything that is needed while the virtual machine disk image + # userland filesystem is still mounted as a md(4) device. + vm_setup sync while ! umount ${DESTDIR}; do i=$(( $i + 1 )) @@ -184,6 +190,9 @@ vm_create_vmdisk() { -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} + # Run anything that is needed for the virtual machine disk image + # after it has been created. + vm_postbuild_setup return 0 }