tweaks

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"