Attachment 169100 Details for Bug 208630 – Patch against -CURRENT r297697

[patch] Patch against -CURRENT r297697

patch-CURRENT-r297697-SWAPFIX-usr.sbin-bsdinstall-scripts-zfsboot (text/plain), 998 bytes, created by Ganael LAPLANCHE on 2016-04-08 09:09:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2016-04-08 09:09:02 UTC

Size: 998 bytes

patch

obsolete

>Index: usr.sbin/bsdinstall/scripts/zfsboot
>===================================================================
>--- usr.sbin/bsdinstall/scripts/zfsboot	(revision 297697)
>+++ usr.sbin/bsdinstall/scripts/zfsboot	(working copy)
>@@ -964,6 +964,8 @@
> 	f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize
> 	if [ "$isswapmirror" ]; then
> 		# This is not the first disk in the mirror, do nothing
>+	elif [ ${swapsize:-0} -eq 0 ]; then
>+		# If swap is 0 sized, don't add it to fstab
> 	elif [ "$ZFSBOOT_SWAP_ENCRYPTION" -a "$ZFSBOOT_SWAP_MIRROR" ]; then
> 		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
> 		             /dev/mirror/swap.eli none swap sw 0 0 \
>@@ -981,8 +983,6 @@
> 		             /dev/$disk${swappart}.eli none swap sw 0 0 \
> 		             $BSDINSTALL_TMPETC/fstab ||
> 		             return $FAILURE
>-	elif [ ${swapsize:-0} -eq 0 ]; then
>-		# If swap is 0 sized, don't add it to fstab
> 	else
> 		f_eval_catch $funcname printf "$PRINTF_FSTAB" \
> 		             /dev/$disk$swappart none swap sw 0 0 \

Actions: View | Diff

Attachments on bug 208630: 169100