D10738.id28552.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10738.id28552.diff
View Options

	Index: usr.sbin/bsdinstall/scripts/script
	===================================================================
	--- usr.sbin/bsdinstall/scripts/script
	+++ usr.sbin/bsdinstall/scripts/script
	@@ -42,6 +42,11 @@
	# DISTRIBUTIONS
	# BSDINSTALL_DISTDIR

	+#
	+# Default name of the ZFS boot-pool
	+#
	+: ${ZFSBOOT_POOL_NAME:=zroot}
	+
	############################################################ GLOBALS

	#
	@@ -53,8 +58,6 @@

	error()
	{
	- [ -f "$PATH_FSTAB" ] && bsdinstall umount
	-
	local file
	f_getvar "$VAR_DEBUG_FILE#+" file
	if [ "$file" ]; then
	@@ -63,6 +66,13 @@
	# No need to restore title, pining for the fjords
	fi

	+ [ -f "$PATH_FSTAB" ] \|\| exit
	+ if [ "$ZFSBOOT_DISKS" ]; then
	+ zpool export $ZFSBOOT_POOL_NAME
	+ else
	+ bsdinstall umount
	+ fi
	+
	exit 1
	}

	@@ -99,8 +109,8 @@
	bsdinstall zfsboot
	else
	bsdinstall scriptedpart "$PARTITIONS"
	+ bsdinstall mount
	fi
	-bsdinstall mount

	# Unpack distributions
	bsdinstall checksum
	@@ -128,7 +138,11 @@
	fi

	bsdinstall entropy
	-bsdinstall umount
	+if [ "$ZFSBOOT_DISKS" ]; then
	+ zpool export $ZFSBOOT_POOL_NAME
	+else
	+ bsdinstall umount
	+fi

	f_dprintf "Installation Completed at %s" "$( date )"