D35330.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35330.diff
View Options

	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
	@@ -56,3 +56,9 @@
	# 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
	diff --git a/usr.sbin/bsdinstall/scripts/umount b/usr.sbin/bsdinstall/scripts/umount
	--- a/usr.sbin/bsdinstall/scripts/umount
	+++ b/usr.sbin/bsdinstall/scripts/umount
	@@ -26,6 +26,13 @@
	#
	# $FreeBSD$

	+# If we mounted the DVD packages, unmount them
	+if [ -d $BSDINSTALL_CHROOT/dist/packages ]; then
	+ umount $BSDINSTALL_CHROOT/dist/packages
	+ rmdir $BSDINSTALL_CHROOT/dist/packages
	+ rmdir $BSDINSTALL_CHROOT/dist
	+fi
	+
	TMP_FSTAB=${TMPDIR:-"/tmp"}/bsdinstall-tmp-fstab

	cat $PATH_FSTAB \| awk -v BSDINSTALL_CHROOT=$BSDINSTALL_CHROOT '{