Index: head/release/ia64/doFS.sh
===================================================================
--- head/release/ia64/doFS.sh	(revision 112863)
+++ head/release/ia64/doFS.sh	(revision 112864)
@@ -1,76 +1,74 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # See also: ../scripts/doFS.sh
 #
 
 set -e
 
 FSIMG=$1; shift
 RD=$1 ; shift
 MNT=$1 ; shift
 FSSIZE=$1 ; shift
 FSPROTO=$1 ; shift
 FSINODE=$1 ; shift
 FSLABEL=$1 ; shift
 
 # If the disklabel is not equal to "efi", we have to create a "normal"
 # UFS filesystem. In that case, call the generic version:
 if [ x$FSLABEL != "xefi" ]; then
     DOFS_SH=`dirname $0`/../scripts/`basename $0`
     echo Tranferring control to $DOFS_SH...
     exec sh $DOFS_SH ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL
 fi
 
 export BLOCKSIZE=512
 
 # Express the size on 512-byte blocks for newfs_msdos
 FSSIZE=$((${FSSIZE}*2))
 
 rm -f ${FSIMG}
 dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=512 2>/dev/null
 
 if [ "x${MDDEVICE}" != "x" ] ; then
     umount /dev/${MDDEVICE} 2>/dev/null || true
     umount ${MNT} 2>/dev/null || true
     mdconfig -d -u ${MDDEVICE} 2>/dev/null || true
 fi
 
 MDDEVICE=`mdconfig -a -t vnode -f ${FSIMG}`
 if [ ! -c /dev/${MDDEVICE} ] ; then
     if [ ! -f /dev/MAKEDEV ] ; then
 	echo "No /dev/$MDDEVICE and no MAKEDEV" 1>&2
 	mdconfig -d -u ${MDDEVICE} 2>/dev/null || true
 	exit 1
     fi
     (cd /dev && sh MAKEDEV ${MDDEVICE})
 fi
 
+trap "umount ${MNT}; mdconfig -d -u ${MDDEVICE}" EXIT
+
 EFI_SIZE=$((${FSSIZE}-68))
 
 gpt create ${MDDEVICE}
 gpt add -s ${EFI_SIZE} -t c12a7328-f81f-11d2-ba4b-00a0c93ec93b ${MDDEVICE}
 newfs_msdos -F 12 -S 512 -h 4 -o 0 -s ${EFI_SIZE} -u 16 ${MDDEVICE}p1
 mount -t msdos /dev/${MDDEVICE}p1 ${MNT}
 
 if [ -d ${FSPROTO} ]; then
     (set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT})
 else
     cp -p ${FSPROTO} ${MNT}
 fi
 
 # Do some post-population munging so that auto-boot works...
 mkdir -p ${MNT}/efi/boot
 mv ${MNT}/boot/loader.efi ${MNT}/efi/boot/bootia64.efi
 
 df -ki ${MNT}
 
 set `df -ki ${MNT} | tail -1`
-
-umount ${MNT}
-
-mdconfig -d -u ${MDDEVICE} 2>/dev/null || true
 
 echo "*** Filesystem is ${FSSIZE} K, $4 left"
 echo "***     ${FSINODE} bytes/inode, $7 left"
Index: head/release/scripts/doFS.sh
===================================================================
--- head/release/scripts/doFS.sh	(revision 112863)
+++ head/release/scripts/doFS.sh	(revision 112864)
@@ -1,136 +1,136 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 set -ex
 
 export BLOCKSIZE=512
 
 MACHINE=${1:+"-m $1"}; shift
 FSIMG=$1; shift
 RD=$1 ; shift
 MNT=$1 ; shift
 FSSIZE=$1 ; shift
 FSPROTO=$1 ; shift
 FSINODE=$1 ; shift
 FSLABEL=$1 ; shift
 
 #
 # We don't have any bootblocks on ia64. Note that -B implies -r,
 # so we have to specifically specify -r when we don't have -B.
 # disklabel fails otherwise.
 #
 if [ -f "${RD}/trees/base/boot/boot" ]; then
 	BOOT="-B -b ${RD}/trees/base/boot/boot"
 elif [ -f "${RD}/trees/base/boot/boot1" ]; then
 	BOOT="-B -b ${RD}/trees/base/boot/boot1"
 	if [ -f "${RD}/trees/base/boot/boot2" ]; then
 		BOOT="${BOOT} -s ${RD}/trees/base/boot/boot2"
 	fi
 else
 	BOOT="-r"
 fi
 
 deadlock=20
 
 dofs_vn () {
     if [ "x$VNDEVICE" = "x" ] ; then
 	VNDEVICE=vn0
     fi
     u=`expr $VNDEVICE : 'vn\([0-9]*\)' || true`
     VNDEVICE=vnn$u
 
     rm -f /dev/*vnn*
     mknod /dev/rvnn${u} c 43 `expr 65538 + $u '*' 8`
     mknod /dev/rvnn${u}c c 43 `expr 2 + $u '*' 8`
     mknod /dev/vnn${u} b 15 `expr 65538 + $u '*' 8`
     mknod /dev/vnn${u}c b 15 `expr 2 + $u '*' 8`
 
     while true 
     do
 	rm -f ${FSIMG}
 
 	umount /dev/${VNDEVICE} 2>/dev/null || true
 	umount ${MNT} 2>/dev/null || true
 	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true
 
 	dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null
 
 	vnconfig -s labels -c /dev/r${VNDEVICE} ${FSIMG}
+
+	trap "umount ${MNT}; vnconfig -u /dev/r${VNDEVICE}" EXIT
+
 	disklabel -w ${BOOT} ${VNDEVICE} ${FSLABEL}
 	newfs -i ${FSINODE} -o space -m 0 /dev/r${VNDEVICE}c
 
 	mount /dev/${VNDEVICE}c ${MNT}
 
 	if [ -d ${FSPROTO} ]; then
 		(set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT})
 	else
 		cp -p ${FSPROTO} ${MNT}
 	fi
 
 	df -ki ${MNT}
 
 	set `df -ki ${MNT} | tail -1`
 
-	umount ${MNT}
-	vnconfig -u /dev/r${VNDEVICE} 2>/dev/null || true
-
 	echo "*** Filesystem is ${FSSIZE} K, $4 left"
 	echo "***     ${FSINODE} bytes/inode, $7 left"
 	break;
     done
 
     rm -f /dev/*vnn*
 }
 
 dofs_md () {
     while true 
     do
 	rm -f ${FSIMG}
 
 	if [ "x${MDDEVICE}" != "x" ] ; then
 		umount /dev/${MDDEVICE} 2>/dev/null || true
 		umount ${MNT} 2>/dev/null || true
 		mdconfig -d -u ${MDDEVICE} 2>/dev/null || true
 	fi
 
 	dd of=${FSIMG} if=/dev/zero count=${FSSIZE} bs=1k 2>/dev/null
 
 	MDDEVICE=`mdconfig -a -t vnode -f ${FSIMG}`
 	if [ ! -c /dev/${MDDEVICE} ] ; then
 		echo "No /dev/$MDDEVICE" 1>&2
 		exit 1
 	fi
+
+	trap "umount ${MNT}; mdconfig -d -u ${MDDEVICE}" EXIT
+
 	disklabel ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL}
 	newfs -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c
 
 	mount /dev/${MDDEVICE}c ${MNT}
 
 	if [ -d ${FSPROTO} ]; then
 		(set -e && cd ${FSPROTO} && find . -print | cpio -dump ${MNT})
 	else
 		cp -p ${FSPROTO} ${MNT}
 	fi
 
 	df -ki ${MNT}
 
 	set `df -ki ${MNT} | tail -1`
-
-	umount ${MNT}
-	mdconfig -d -u ${MDDEVICE} 2>/dev/null || true
 
 	echo "*** Filesystem is ${FSSIZE} K, $4 left"
 	echo "***     ${FSINODE} bytes/inode, $7 left"
 	break;
     done
 }
 
 case `uname -r` in
 [1-4].*)
 	dofs_vn
 	;;
 *)
 	dofs_md
 	;;
 esac