View | Details | Raw Unified | Return to bug 208630
Collapse All | Expand All

(-)usr.sbin/bsdinstall/scripts/zfsboot (-2 / +2 lines)
Lines 964-969 Link Here
964
	f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize
964
	f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize
965
	if [ "$isswapmirror" ]; then
965
	if [ "$isswapmirror" ]; then
966
		# This is not the first disk in the mirror, do nothing
966
		# This is not the first disk in the mirror, do nothing
967
	elif [ ${swapsize:-0} -eq 0 ]; then
968
		# If swap is 0 sized, don't add it to fstab
967
	elif [ "$ZFSBOOT_SWAP_ENCRYPTION" -a "$ZFSBOOT_SWAP_MIRROR" ]; then
969
	elif [ "$ZFSBOOT_SWAP_ENCRYPTION" -a "$ZFSBOOT_SWAP_MIRROR" ]; then
968
		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
970
		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
969
		             /dev/mirror/swap.eli none swap sw 0 0 \
971
		             /dev/mirror/swap.eli none swap sw 0 0 \
Lines 981-988 Link Here
981
		             /dev/$disk${swappart}.eli none swap sw 0 0 \
983
		             /dev/$disk${swappart}.eli none swap sw 0 0 \
982
		             $BSDINSTALL_TMPETC/fstab ||
984
		             $BSDINSTALL_TMPETC/fstab ||
983
		             return $FAILURE
985
		             return $FAILURE
984
	elif [ ${swapsize:-0} -eq 0 ]; then
985
		# If swap is 0 sized, don't add it to fstab
986
	else
986
	else
987
		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
987
		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
988
		             /dev/$disk$swappart none swap sw 0 0 \
988
		             /dev/$disk$swappart none swap sw 0 0 \

Return to bug 208630