View | Details | Raw Unified | Return to bug 194359 | Differences between
and this patch

Collapse All | Expand All

(-)usr.sbin/bsdinstall/scripts/zfsboot (+11 lines)
Lines 197-202 Link Here
197
GPART_CREATE='gpart create -s %s "%s"'
197
GPART_CREATE='gpart create -s %s "%s"'
198
GPART_DESTROY_F='gpart destroy -F "%s"'
198
GPART_DESTROY_F='gpart destroy -F "%s"'
199
GPART_SET_ACTIVE='gpart set -a active -i %s "%s"'
199
GPART_SET_ACTIVE='gpart set -a active -i %s "%s"'
200
GPART_SET_DISK_ACTIVE='gpart set -a active "%s"'
200
GRAID_DELETE='graid delete "%s"'
201
GRAID_DELETE='graid delete "%s"'
201
LN_SF='ln -sf "%s" "%s"'
202
LN_SF='ln -sf "%s" "%s"'
202
MKDIR_P='mkdir -p "%s"'
203
MKDIR_P='mkdir -p "%s"'
Lines 870-875 Link Here
870
		             zfs$index freebsd-zfs $disk || return $FAILURE
871
		             zfs$index freebsd-zfs $disk || return $FAILURE
871
		f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
872
		f_eval_catch -d $funcname zpool "$ZPOOL_LABELCLEAR_F" \
872
		                /dev/$disk$targetpart
873
		                /dev/$disk$targetpart
874
875
		#
876
		# 5. Set the pMBR active if booted via BIOS
877
		#
878
		bootmethod=$(sysctl -n machdep.bootmethod)
879
		f_dprintf "machdep.bootmethod=[%s]" "$bootmethod"
880
		if [ "$bootmethod" = "BIOS" ]; then
881
			f_eval_catch $funcname gpart \
882
				"$GPART_SET_DISK_ACTIVE" $disk ||
883
				return $FAILURE
873
		;;
884
		;;
874
885
875
	MBR) f_dprintf "$funcname: Creating MBR layout..."
886
	MBR) f_dprintf "$funcname: Creating MBR layout..."

Return to bug 194359