diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -16,6 +16,7 @@
 	keymap \
 	mirrorselect \
 	mount \
+	mount_aux \
 	netconfig \
 	netconfig_ipv4 \
 	netconfig_ipv6 \
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -405,6 +405,7 @@
 	clear
 	echo "Use this shell to set up partitions for the new system. When finished, mount the system at $BSDINSTALL_CHROOT and place an fstab file for the new system at $PATH_FSTAB. Then type 'exit'. You can also enter the partition editor at any time by entering 'bsdinstall partedit'."
 	sh 2>&1
+	bsdinstall mount_aux || error "Failed to mount auxiliary filesystems"
 	;;
 "$msg_manual")		# Manual
 	if f_isset debugFile; then
diff --git a/usr.sbin/bsdinstall/scripts/mount b/usr.sbin/bsdinstall/scripts/mount
--- a/usr.sbin/bsdinstall/scripts/mount
+++ b/usr.sbin/bsdinstall/scripts/mount
@@ -52,12 +52,4 @@
 	fi
 done
 
-# User might want a shell and require devfs, so mount it
-mkdir $BSDINSTALL_CHROOT/dev 2>/dev/null
-mount -t devfs devfs $BSDINSTALL_CHROOT/dev
-
-# If installing from the DVD, mount packages where they'll be accessible
-if [ -d /packages ]; then
-	mkdir -p $BSDINSTALL_CHROOT/dist/packages
-	mount -t nullfs /packages $BSDINSTALL_CHROOT/dist/packages
-fi
+bsdinstall mount_aux
diff --git a/usr.sbin/bsdinstall/scripts/mount b/usr.sbin/bsdinstall/scripts/mount_aux
copy from usr.sbin/bsdinstall/scripts/mount
copy to usr.sbin/bsdinstall/scripts/mount_aux
--- a/usr.sbin/bsdinstall/scripts/mount
+++ b/usr.sbin/bsdinstall/scripts/mount_aux
@@ -28,30 +28,6 @@
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 
-TMP_FSTAB=${TMPDIR:-"/tmp"}/bsdinstall-tmp-fstab
-
-cat $PATH_FSTAB | awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{
-	if ($2 ~ "^/.*") {
-		fsname = $2;
-		if (fsname == "/")
-			fsname = ""
-		printf("%s\t%s%s\t%s\t%s\t%s\t%s\n", $1, BSDINSTALL_CHROOT,
-		    fsname, $3, $4, $5, $6);
-	}
-}' > $TMP_FSTAB
-
-FILESYSTEMS=`cat $TMP_FSTAB | awk '/^[^#].*/ {if ($2 ~ "^/.*") printf("%s\n", $2);}' | sort -t /`
-
-for i in $FILESYSTEMS; do
-	mkdir -p $i 2>/dev/null
-	MNTERROR=`mount -F $TMP_FSTAB $i 2>&1`
-	if [ $? -ne 0 ]; then
-		bsddialog --backtitle "$OSNAME Installer" --title "Error" \
-		    --msgbox "Error mounting partition $i:\n$MNTERROR" 0 0
-		exit 1
-	fi
-done
-
 # User might want a shell and require devfs, so mount it
 mkdir $BSDINSTALL_CHROOT/dev 2>/dev/null
 mount -t devfs devfs $BSDINSTALL_CHROOT/dev