diff options
| author | allanjude <allanjude@FreeBSD.org> | 2016-05-10 14:38:43 +0000 |
|---|---|---|
| committer | allanjude <allanjude@FreeBSD.org> | 2016-05-10 14:38:43 +0000 |
| commit | d4d35ffaf86e1bfb2b151f26b548fc9d78cce7d1 (patch) | |
| tree | 7d43c107350d0a4ef1c7c4dfc972503726441657 /usr.sbin/bsdinstall | |
| parent | 4773bac9ba74a912077a13a796e4d88ad37cfb2f (diff) | |
| download | FreeBSD-src-d4d35ffaf86e1bfb2b151f26b548fc9d78cce7d1.zip FreeBSD-src-d4d35ffaf86e1bfb2b151f26b548fc9d78cce7d1.tar.gz | |
bsdinstall/zfsboot: Do not mirror swap when swapsize is 0
PR: 209415
Submitted by: Ganael LAPLANCHE <ganael.laplanche@corp.ovh.com>
MFC after: 2 weeks
Diffstat (limited to 'usr.sbin/bsdinstall')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index dc0eedc..6f6a3cf 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -1233,7 +1233,7 @@ zfs_create_boot() # # Create the gmirror(8) GEOMS for swap # - if [ "$ZFSBOOT_SWAP_MIRROR" ]; then + if [ ${swapsize:-0} -gt 0 -a "$ZFSBOOT_SWAP_MIRROR" ]; then for disk in $disks; do swap_devs="$swap_devs $disk$swappart" done |
