From dc0f7796b2d139ba2e9efb5150cffdf49b200cfa Mon Sep 17 00:00:00 2001 From: sean Date: Tue, 9 Jul 2019 13:31:34 -0700 Subject: [PATCH] tweaks --- setup.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/setup.sh b/setup.sh index 74fe523..2bc2b3b 100644 --- a/setup.sh +++ b/setup.sh @@ -42,14 +42,7 @@ for disk in `echo $disks`; do # remove echo for testing echo "Partitioning disk $disk..." # collect the return values, check them for errors and display them - sgdisk --zap-all /dev/disk/by-id/$disk - #2>&1 1>/dev/null && - sgdisk -n2:1M:+512M -t2:EF00 /dev/disk/by-id/$disk - #2>&1 1>/dev/null && - sgdisk -n3:0:+512M -t3:BF01 /dev/disk/by-id/$disk - #2>&1 1>/dev/null && - sgdisk -n4:0:0 -t4:BF01 /dev/disk/by-id/$disk - #2>&1 1>/dev/null` + errors=`sgdisk --zap-all /dev/disk/by-id/$disk 2>&1 1>/dev/null && sgdisk -n2:1M:+512M -t2:EF00 /dev/disk/by-id/$disk 2>&1 1>/dev/null && sgdisk -n3:0:+512M -t3:BF01 /dev/disk/by-id/$disk 2>&1 1>/dev/null && sgdisk -n4:0:0 -t4:BF01 /dev/disk/by-id/$disk 2>&1 1>/dev/null` if ! [ "$?" = "0" ]; then echo "Failed to partition disk $disk - $errors" exit 3 @@ -58,8 +51,8 @@ for disk in `echo $disks`; do done # create boot mirror list -bootmirror=""; for disk in "$disks": do bootmirror="$bootmirror /dev/disk/by-id/${disk}-part3"; done -rootraidz=""; for disk in "$disks"; do rootraidz="$rootraidz /dev/disk/by-id/${disk}-part4"; done +bootmirror=""; for disk in `echo $disks`: do bootmirror="$bootmirror /dev/disk/by-id/${disk}-part3"; done +rootraidz=""; for disk in `echo $disks`; do rootraidz="$rootraidz /dev/disk/by-id/${disk}-part4"; done echo "zpool create -f -o ashift=12 -d -o feature@async_destroy=enable -o feature@bookmarks=enabled -o feature@embedded_data=enabled -o feature@empty_bpobj=enabled -o feature@enabled_txg=enabled -o feature@extensible_dataset=enabled -o feature@filesystem_limits=enabled -o feature@hole_birth=enabled -o feature@large_blocks=enabled -o feature@lz4_compress=enabled -o feature@spacemap_histogram=enabled -o feature@userobj_accounting=enabled -O acltype=posixacl -O canmount=off -O compression=lz4 -O devices=off -O normalization=formD -O relatime=on -O xattr=sa -O mountpoint=/ -R /mnt bpool mirror$bootmirror"