svn commit: r274726 - projects/release-vmimage/release/tools

[Colin Percival]

Author: cperciva
Date: Wed Nov 19 22:17:22 2014
New Revision: 274726
URL: https://svnweb.freebsd.org/changeset/base/274726

Log:
  Silence errors when umounting the chroot's /dev, since it probably doesn't
  exist when we're running this.
  
  Unmount filesystems before attempting to destroy the md which holds them.

Modified:
  projects/release-vmimage/release/tools/vmimage.subr

Modified: projects/release-vmimage/release/tools/vmimage.subr
==============================================================================
--- projects/release-vmimage/release/tools/vmimage.subr	Wed Nov 19 20:19:53 2014	(r274725)
+++ projects/release-vmimage/release/tools/vmimage.subr	Wed Nov 19 22:17:22 2014	(r274726)
@@ -42,11 +42,11 @@ err() {
 }
 
 cleanup() {
+	umount ${DESTDIR}/dev 2>/dev/null
+	umount ${DESTDIR}
 	if [ ! -z "${mddev}" ]; then
 		mdconfig -d -u ${mddev}
 	fi
-	umount ${DESTDIR}/dev
-	umount ${DESTDIR}
 
 	return 0
 }