From c0b5434f446a3473d1ba35ca397056229aff9b94 Mon Sep 17 00:00:00 2001
From: sean <sean>
Date: Tue, 9 Jul 2019 13:37:47 -0700
Subject: [PATCH] tweaks

---
 setup.sh | 71 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 43 insertions(+), 28 deletions(-)

diff --git a/setup.sh b/setup.sh
index c5a64cc..d4f0f4b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -55,7 +55,14 @@ 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"
+echo ""
+echo "Creating boot zpool..."
+errors=`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 2>&1 1>/dev/null`
+if ! [ "$?" = "0" ]; then
+	echo "Failed to create boot pool - $errors"
+	exit 4
+fi
+echo "Done."
 
 if [ "$raidtype" = "none" ]; then
 	raidtype=""
@@ -65,32 +72,40 @@ fi
 
 # test for boot pool creation
 
-echo "zpool create -f -o ashift=12 -O acltype=posixacl -O canmount=off -O compression=lz4 -O dnodesize=auto -O normalization=formD -O relatime=on -O xattr=sa -O mountpoint=/ -R /mnt rpool${raidtype}${rootraidz}"
-
-#zfs create -o canmount=off -o mountpoint=none rpool/ROOT
-#zfs create -o canmount=off -o mountpoint=none bpool/BOOT
-# zfs create -o canmount=noauto -o mountpoint=/ rpool/ROOT/ubuntu
-# zfs mount rpool/ROOT/ubuntu
-# zfs create -o canmount=noauto -o mountpoint=/boot bpool/BOOT/ubuntu
-# zfs mount bpool/BOOT/ubuntu
-# zfs create                                 rpool/home
-# zfs create -o mountpoint=/root             rpool/home/root
-# zfs create -o canmount=off                 rpool/var
-# zfs create -o canmount=off                 rpool/var/lib
-# zfs create                                 rpool/var/log
-# zfs create                                 rpool/var/spool
-# zfs create -o com.sun:auto-snapshot=false  rpool/var/cache
-# zfs create -o com.sun:auto-snapshot=false  rpool/var/tmp
-# chmod 1777 /mnt/var/tmp
-# zfs create                                 rpool/opt
-# zfs create                                 rpool/srv
-# zfs create -o canmount=off                 rpool/usr
-# zfs create                                 rpool/usr/local
-# zfs create                                 rpool/var/mail
-# zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/docker
-# zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/nfs
-# zfs create -o com.sun:auto-snapshot=false  rpool/tmp
-# chmod 1777 /mnt/tmp
+echo ""
+echo "Creating main zpool..."
+error=`zpool create -f -o ashift=12 -O acltype=posixacl -O canmount=off -O compression=lz4 -O dnodesize=auto -O normalization=formD -O relatime=on -O xattr=sa -O mountpoint=/ -R /mnt rpool${raidtype}${rootraidz} 2>&1 1>/dev/null`
+if ! [ "$?" = "0" ]; then
+	echo "Failed to create main pool - $errors"
+	exit 5
+fi
+echo "Done."
+
+zfs create -o canmount=off -o mountpoint=none rpool/ROOT
+zfs create -o canmount=off -o mountpoint=none bpool/BOOT
+zfs create -o canmount=noauto -o mountpoint=/ rpool/ROOT/ubuntu
+zfs mount rpool/ROOT/ubuntu
+zfs create -o canmount=noauto -o mountpoint=/boot bpool/BOOT/ubuntu
+zfs mount bpool/BOOT/ubuntu
+zfs create                                 rpool/home
+zfs create -o mountpoint=/root             rpool/home/root
+zfs create -o canmount=off                 rpool/var
+zfs create -o canmount=off                 rpool/var/lib
+zfs create                                 rpool/var/log
+zfs create                                 rpool/var/spool
+zfs create -o com.sun:auto-snapshot=false  rpool/var/cache
+zfs create -o com.sun:auto-snapshot=false  rpool/var/tmp
+chmod 1777 /mnt/var/tmp
+zfs create                                 rpool/opt
+zfs create                                 rpool/srv
+zfs create -o canmount=off                 rpool/usr
+zfs create                                 rpool/usr/local
+zfs create                                 rpool/var/mail
+zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/docker
+zfs create -o com.sun:auto-snapshot=false  rpool/var/lib/nfs
+zfs create -o com.sun:auto-snapshot=false  rpool/tmp
+chmod 1777 /mnt/tmp
+exit 0
 # debootstrap bionic /mnt
 # zfs set devices=off rpool
 # echo HOSTNAME > /mnt/etc/hostname
@@ -106,7 +121,7 @@ for nic in "$nicdevices"; do
 	network="$network\n    ${nic}:\n      dhcp4: no"
 done
 network="$network\n  bridges:\n    br0:\n      macaddress: ${macaddr}\n      dhcp4: yes\n      parameters:\n        stp: true\n      interfaces:"
-for nic in "$nicdevices";l do
+for nic in `echo "$nicdevices"`; do
 	network="$network\n        - ${nic}"
 done
 # echo "$network" > /mnt/etc/netplan/bridge.yaml