Do not add swap to fstab when swapsize is 0
If a user requested encrypted swap, but 0 sized, it would still be added to fstab PR: 208630 Submitted by: Ganael LAPLANCHE <ganael.laplanche@corp.ovh.com> MFC after: 2 weeks Sponsored by: ScaleEngine Inc.
This commit is contained in:
parent
fd12934507
commit
0a04943726
@ -964,6 +964,8 @@ zfs_create_diskpart()
|
||||
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 @@ zfs_create_diskpart()
|
||||
/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 \
|
||||
|
Loading…
Reference in New Issue
Block a user