Merge branch 'master' of https://code.totosearch.org/Sean/ServerSetup into nobridge

(still requires at least one network interface)

README.md

@@ -1,5 +1,8 @@
 Server Setup Script
 =====================
 
-#Use#
+#Setup#
 wget -qO - https://code.totosearch.org/Sean/ServerSetup/raw/branch/master/setup.sh | sudo bash
+
+#Maintenance#
+wget -qO - https://code.totosearch.org/Sean/ServerSetup/raw/branch/master/maintenance.sh | sudo bash

maintenance.sh

@@ -0,0 +1,67 @@
+#! /bin/bash
+
+echo ""
+echo "Updating local packages..."
+errors=`apt-add-repository universe >/dev/null 2>/dev/null && apt-get update 2>&1 >/dev/null && apt-get install -y zfs-initramfs`
+if [ "$?" = "0" ]; then
+	echo "Done."
+else
+	echo "Failed to add universal repository, update apt repository - $errors"
+	exit 1
+fi
+
+echo ""
+echo "Importing boot pool and main OS pool..."
+errors=$(zpool export -a 2>&1 1>/dev/null && zpool import -N -R /mnt rpool 2>&1 1>/dev/null && zpool import -N -R /mnt bpool 2>&1 1>/dev/null && zfs mount rpool/ROOT/ubuntu 2>&1 1>/dev/null) 
+# && zfs mount -a 2>&1 1>/dev/null
+if [ "$?" = "0" ]; then
+	echo "Done."
+else
+	echo "Failed to mount bpool or rpool - $errors"
+	exit 2
+fi
+
+
+echo ""
+echo "Binding mounts..."
+errors=`mount --rbind /dev /mnt/dev 2>&1 1>/dev/null && mount --rbind /proc /mnt/proc 2>&1 1>/dev/null && mount --rbind /sys /mnt/sys 2>&1 1>/dev/null`
+if ! [ "$?" = "0" ]; then
+	echo "Failed to bind mounts - $errors"
+	exit 4
+fi
+echo "Done."
+
+echo ""
+echo "Entering chroot, type \"exit\" to leave..."
+echo ""
+
+echo "#!/bin/bash" > /mnt/maintenance.sh
+chmod +x /mnt/maintenance.sh
+echo "zfs mount -a && mount /boot" >> /mnt/maintenance.sh
+echo "/bin/bash" >> /mnt/maintenance.sh
+echo "umount /boot" >> /mnt/maintenance.sh
+echo "zfs umount -a" >> /mnt/maintenance.sh
+
+chroot /mnt /maintenance.sh --login < /dev/tty
+
+rm /mnt/maintenance.sh
+
+if ! [ "$?" = "0" ]; then
+	echo "Chroot failed with an error"
+	exit $?
+fi
+
+
+
+echo ""
+echo "Unbinding mounts..."
+errors=`mount | grep -v zfs | tac | awk '/\\/mnt/ {print \$3}' | xargs -i{} umount -lf \{\} 2>&1 1>/dev/null && zpool export -a 2>&1 1>/dev/null`
+if ! [ "$?" = "0" ]; then
+	echo "Failed to unbind mounts - $errors"
+	exit 4
+fi
+echo "Done."
+echo ""
+
+
+exit 0

setup.sh

@@ -2,7 +2,7 @@
 
 echo ""
 echo "Updating local packages..."
-errors=`apt-add-repository universe >/dev/null 2>/dev/null && apt update 2>&1 >/dev/null`
+errors=`apt-add-repository universe >/dev/null 2>&1 1>/dev/null && apt update 2>&1 >/dev/null`
 if [ "$?" = "0" ]; then
 	echo "Done."
 else
@@ -25,6 +25,8 @@ width=`tput cols`
 height=`tput lines`
 window=$((height - 5))
 
+if [ -d "/sys/firmware/efi" ]; then efi="1"; echo -e "\nUEFI detected..." else efi="0"; echo -e "\nBIOS detected..."; fi
+
 # gather input at the start
 devices=""; for device in $(ls /dev/disk/by-id | grep -v part); do devices="$devices $device off"; done
 disks=`dialog --separate-output --no-cancel --no-items --title "Root devices" --checklist "Select root OS disks:" $height $width ${window}$devices 2>&1 1>/dev/tty`
@@ -56,7 +58,12 @@ swapspace=$(($swapspace * `getconf PAGESIZE`))
 # 20% swap space with 2G minimum
 if [ "$swapspace" -lt "2048000" ]; then swapspace="2048000" ; fi
 
-nics=`dialog --separate-output --no-cancel --no-items --title "Bridged network devices" --checklist "Select the network devices to be bridged to br0:" $height $width ${window}$nicdevices 2>&1 1>/dev/tty`
+nics=`dialog --separate-output --no-cancel --no-items --title "Bridged network devices" --checklist "Select the network devices to be bridged to bridge - select none for no bridge:" $height $width ${window}$nicdevices 2>&1 1>/dev/tty`
+if [ -z "$nics" ]; then 
+	bridgedevice=`dialog --no-cancel --no-items --title "Configure network devices" --radiolist "NO BRIDGE MODE!\nSelect the network device to configure:" $height $width ${window}$nicdevices 2>&1 1>/dev/tty`
+else
+	bridgedevice="br0"
+fi
 networktype=`dialog --no-items --no-cancel --title "Network type" --radiolist "Select the network type:" 9 40 2 dhcp off static off 2>&1 1>/dev/tty`
 if [ "$networktype" = "static" ]; then
 	address=""; while [ -z "$address" ]; do address=`dialog --no-cancel --inputbox "IP Address:" 8 40 2>&1 >/dev/tty`; done
@@ -106,10 +113,12 @@ for disk in `echo "$alldisks"`; do
         echo "Done."
 done
 
+if [ "$efi" = "1" ]; then
+
 	for disk in `echo "$boots"`; do
 			echo ""
 			echo "Creating boot partitions for device $disk..."
-		errors=`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`
+			errors=`sgdisk -n1:1M:+512M -t1:EF00 /dev/disk/by-id/$disk 2>&1 1>/dev/null`
 			if ! [ "$?" = "0" ]; then
 				echo "Failed to create boot partition for device $disk - $errors"
 				exit 3
@@ -117,6 +126,32 @@ for disk in `echo "$boots"`; do
 			echo "Done."
 	done
 
+	for disk in `echo "$boots"`; do
+			echo ""
+			echo "Creating boot partitions for device $disk..."
+			errors=`sgdisk -n3:0:+512M -t3:BF01 /dev/disk/by-id/$disk 2>&1 1>/dev/null`
+			if ! [ "$?" = "0" ]; then
+				echo "Failed to create boot partition for device $disk - $errors"
+				exit 3
+			fi
+			echo "Done."
+	done
+
+else
+
+	for disk in `echo "$boots"`; do
+			echo ""
+			echo "Creating boot partitions for device $disk..."
+			errors=`sgdisk -a1 -n1:24K:+1000K -t1:EF02 /dev/disk/by-id/$disk 2>&1 1>/dev/null`
+			if ! [ "$?" = "0" ]; then
+				echo "Failed to create boot partition for device $disk - $errors"
+				exit 3
+			fi
+			echo "Done."
+	done
+
+fi
+
 for disk in `echo "$disks"`; do
 		echo ""
         echo "Creating main storage for device $disk..."
@@ -128,18 +163,31 @@ for disk in `echo "$disks"`; do
         echo "Done."
 done
 
-# create boot mirror list
-bootmirror=""; rootraidz=""; for disk in `echo "$disks"`; do bootmirror="$bootmirror /dev/disk/by-id/${disk}-part3"; rootraidz="$rootraidz /dev/disk/by-id/${disk}-part4"; done
+# create boot mirror list and root list
+
+count="0"; bootmirror=""; for disk in `echo "$boots"`; do bootmirror="$bootmirror /dev/disk/by-id/${disk}-part3"; count=$((count + 1)); done; if [ "$count" -gt "1" ]; then bootmirror="mirror $bootmirror"; fi
+rootraidz=""; for disk in `echo "$disks"`; do rootraidz="$rootraidz /dev/disk/by-id/${disk}-part4"; done
 
 # refresh drives or there are missing partitions
 partprobe 2>/dev/null 1>/dev/null
 
 # wait for the partitions to show up
+
 for disk in `echo "$boots"`; do
 	pending="0"
 	while ! [ -e "/dev/disk/by-id/${disk}-part3" ]; do
 		partprobe 2>/dev/null 1>/dev/null
-		if [ "$pending" = "0" ]; then echo "" && echo "Waiting for ${disk} boot partition to update..."; pending="1"; fi
+		if [ "$pending" = "0" ]; then echo "" && echo "Waiting for ${disk} boot pool partition to update on device ${disk}..."; pending="1"; fi
+		sleep 3
+	done
+	if [ "$pending" = "1" ]; then echo "Done."; fi
+done
+
+for disk in `echo "$boots"`; do
+	pending="0"
+	while ! [ -e "/dev/disk/by-id/${disk}-part1" ]; do
+		partprobe 2>/dev/null 1>/dev/null
+		if [ "$pending" = "0" ]; then echo "" && echo "Waiting for ${disk} boot partition to update on device ${disk}..."; pending="1"; fi
 		sleep 3
 	done
 	if [ "$pending" = "1" ]; then echo "Done."; fi
@@ -147,7 +195,7 @@ done
 
 echo ""
 echo "Creating boot zpool..."
-errors=`zpool create -f -o ashift=12 -d -o feature@async_destroy=enabled -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`
+errors=`zpool create -f -o ashift=12 -d -o feature@async_destroy=enabled -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 $bootmirror 2>&1 1>/dev/null`
 if ! [ "$?" = "0" ]; then
 	echo "Failed to create boot pool - $errors"
 	exit 4
@@ -230,29 +278,6 @@ echo "deb http://archive.ubuntu.com/ubuntu bionic-updates main universe" >> /mnt
 echo "deb-src http://archive.ubuntu.com/ubuntu bionic-updates main universe" >> /mnt/etc/apt/sources.list
 echo "Done."
 
-
-#echo "network:" > /mnt/etc/netplan/bridge.yaml
-#echo "  version: 2" >> /mnt/etc/netplan/bridge.yaml
-#echo "  renderer: networkd"  >> /mnt/etc/netplan/bridge.yaml
-#echo "  ethernets:" >> /mnt/etc/netplan/bridge.yaml
-#for nic in "$nics"; do
-	#echo "    ${nic}:"  >> /mnt/etc/netplan/bridge.yaml
-	#echo "      dhcp4: no"  >> /mnt/etc/netplan/bridge.yaml
-#done
-#echo "  bridges:"  >> /mnt/etc/netplan/bridge.yaml
-#echo "    br0:" >> /mnt/etc/netplan/bridge.yaml
-#echo "      macaddress: ${macaddr}" >> /mnt/etc/netplan/bridge.yaml
-#echo "      dhcp4: yes" >> /mnt/etc/netplan/bridge.yaml
-#echo "      parameters:" >> /mnt/etc/netplan/bridge.yaml
-#echo "        stp: true"  >> /mnt/etc/netplan/bridge.yaml
-#echo "        forward-delay: 0" >> /mnt/etc/netplan/bridge.yaml
-#echo "      interfaces:"  >> /mnt/etc/netplan/bridge.yaml
-#for nic in `echo "$nics"`; do
-	#echo "        - ${nic}" >> /mnt/etc/netplan/bridge.yaml
-#done
-
-
-
 echo ""
 echo "Setting up boot pool import service..."
 echo "[Unit]"> /mnt/etc/systemd/system/zfs-import-bpool.service
@@ -268,7 +293,6 @@ echo "[Install]" >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "    WantedBy=zfs-import.target	"  >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "Done."
 
-
 echo ""
 echo "Creating home directory..."
 errors=`zfs create rpool/home/${admin} 2>&1 1>/dev/null`
@@ -316,7 +340,7 @@ echo "cp /usr/share/zoneinfo/$timezone /etc/localtime" >> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
 echo "echo \"\"" >> /mnt/setup-chroot.sh
-echo "echo \"Installing linux image, ifupdown dnsutils nfs-kernel-server apparmor-profiles vim, libvirt-bin, bridge-utils, net-tools, bash, screen, tmux, zfs-initramfs, dosfstools, mailutils, ssmtp, openssh-server, ufw, docker.io, sharutils...\"" >> /mnt/setup-chroot.sh
+echo "echo \"Installing linux image, ifupdown, dnsutils, nfs-kernel-server, apparmor-profiles, vim, libvirt-bin, bridge-utils, net-tools, bash, screen, tmux, zfs-initramfs, dosfstools, mailutils, ssmtp, openssh-server, ufw, docker.io, sharutils...\"" >> /mnt/setup-chroot.sh
 echo "errors=\$(DEBCONF_FRONTEND='noninteractive' apt install -y --no-install-recommends linux-image-generic 2>&1 1>/dev/null && apt purge -y netplan 2>&1 1>/dev/null && apt autoremove -y 2>&1 1>/dev/null && DEBCONF_FRONTEND='noninteractive' apt install -y ifupdown efibootmgr htop iotop smartmontools dnsutils nfs-kernel-server apparmor-profiles vim libvirt-bin bridge-utils net-tools bash screen tmux zfs-initramfs dosfstools mailutils ssmtp openssh-server ufw docker.io sharutils 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 
 echo 'if ! [ \"$?\" = \"0\" ]; then '>> /mnt/setup-chroot.sh
@@ -336,7 +360,6 @@ echo "	exit 118">> /mnt/setup-chroot.sh
 echo "fi">> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
-
 # configure docker storage to use zfs
 mkdir -p /mnt/etc/docker
 echo "{\"storage-driver\":\"zfs\"}" > /mnt/etc/docker/daemon.json
@@ -347,19 +370,12 @@ echo "net.ipv6.conf.lo.disable_ipv6 = 1" >> /mnt/etc/sysctl.conf
 echo 'echo ""' >> /mnt/setup-chroot.sh
 echo 'echo "Creating EFI partition..."' >> /mnt/setup-chroot.sh
 firstdisk=`echo "$boots" | head -n1`
-echo "error=\$(mkdosfs -F 32 -s 1 -n EFI /dev/disk/by-id/${firstdisk}-part2 2>&1 1>/dev/null && mkdir /boot/efi 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+echo "error=\$(mkdosfs -F 32 -s 1 -n EFI /dev/disk/by-id/${firstdisk}-part1 2>&1 1>/dev/null && mkdir /boot/efi 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 echo 'if ! [ \"$?\" = \"0\" ]; then '>> /mnt/setup-chroot.sh
 echo '	echo "Failed to create dos file system for EFI partition - $errors"' >> /mnt/setup-chroot.sh
 echo "	exit 100">> /mnt/setup-chroot.sh
 echo "fi">> /mnt/setup-chroot.sh
-echo "echo PARTUUID=$(blkid -s PARTUUID -o value /dev/disk/by-id/${firstdisk}-part2) /boot/efi vfat nofail,x-systemd.device-timeout=0 0 1 >> /etc/fstab" >> /mnt/setup-chroot.sh
-
-#echo "echo \"\"" >> /mnt/setup-chroot.sh
-#echo "echo \"Mounting /boot/efi...\"" >> /mnt/setup-chroot.sh
-#echo "mount /boot/efi 2>&1 1>/dev/null" >> /mnt/setup-chroot.sh
-# clear past boots
-#echo "for f in \`efibootmgr -v | grep -e '^Boot[0-9]\\+' | sed 's/^Boot\\([0-9]*\\).*/\\1/g'\`; do efibootmgr -b \$f -B; done" >> /mnt/setup-chroot.sh
-#echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
+echo "echo PARTUUID=$(blkid -s PARTUUID -o value /dev/disk/by-id/${firstdisk}-part1) /boot/efi vfat nofail,x-systemd.device-timeout=0 0 1 >> /etc/fstab" >> /mnt/setup-chroot.sh
 
 echo "errors=\$(mount /boot/efi 2>&1 1>/dev/null && apt install -y grub-efi-amd64-signed shim-signed 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 echo 'if ! [ \"$?\" = \"0\" ]; then '>> /mnt/setup-chroot.sh
@@ -383,15 +399,6 @@ echo "	exit 102">> /mnt/setup-chroot.sh
 echo "fi">> /mnt/setup-chroot.sh
 echo 'echo "Done."'>> /mnt/setup-chroot.sh
 
-#echo 'echo ""'>> /mnt/setup-chroot.sh
-#echo 'echo "Enabling tmp file system mounting..."'>> /mnt/setup-chroot.sh
-#echo "errors=\$(cp /usr/sharesystemd/tmp.mount /etc/systemd/system/ 2>&1 1>/dev/null && systemctl enable tmp.mount 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
-#echo "if ! [ \"\$?\" = \"0\" ]; then echo \"Failed to enable tmp file system mounting - \$errors\"; exit 103; fi" >> /mnt/setup-chroot.sh
-#echo 'echo "Done."'>> /mnt/setup-chroot.sh
-
-#addgroup --system lpadmin
-#addgroup --system sambashare
-
 echo 'echo ""'  >> /mnt/setup-chroot.sh
 echo "echo \"Checking ZFS root...\"" >> /mnt/setup-chroot.sh
 echo 'zfscheck=$(grub-probe /boot 2>&1 1>/dev/null)' >> /mnt/setup-chroot.sh
@@ -400,6 +407,7 @@ echo "echo \"Success.\"" >> /mnt/setup-chroot.sh
 
 echo 'echo ""' >> /mnt/setup-chroot.sh
 echo 'echo "Updating initramfs..."' >> /mnt/setup-chroot.sh
+echo "echo \"vmd\" >> /etc/initramfs-tools/modules" >> /mnt/setup-chroot.sh
 echo 'errors=$(update-initramfs -u -k all 2>&1 1>/dev/null)'  >> /mnt/setup-chroot.sh
 echo 'if ! [ \"$?\" = \"0\" ]; then '>> /mnt/setup-chroot.sh
 echo '	echo "Failed to update initramfs - $errors"' >> /mnt/setup-chroot.sh
@@ -410,11 +418,10 @@ echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 # you need sed to do this right!
 echo 'echo ""'  >> /mnt/setup-chroot.sh
 echo 'echo "Modifying grub for ZFS root..."' >> /mnt/setup-chroot.sh
-echo "errors=\$(sed -ir 's/quiet splash//g' /etc/default/grub 2>&1 1>/dev/null && sed -ir 's/GRUB_CMDLINE_LINUX=\".*\"/GRUB_CMDLINE_LINUX=\"root=ZFS=rpool\/ROOT\/ubuntu\"/g' /etc/default/grub 2>&1 1>/dev/null && sed -ir 's/^#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+echo "errors=\$(sed -ir 's/quiet splash//g' /etc/default/grub 2>&1 1>/dev/null && sed -ir 's/GRUB_CMDLINE_LINUX=\".*\"/GRUB_CMDLINE_LINUX=\"root=ZFS=rpool\/ROOT\/ubuntu rootdelay=10 noresume\"/g' /etc/default/grub 2>&1 1>/dev/null && sed -ir 's/^#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 echo "if ! [ \"\$?\" = \"0\" ]; then echo \"Failed to set grub ZFS root - \$errors\"; exit 104; fi" >> /mnt/setup-chroot.sh
 echo 'echo "Done."' >> /mnt/setup-chroot.sh
 
-
 echo 'echo ""' >> /mnt/setup-chroot.sh
 echo 'echo "Updating grub..."' >> /mnt/setup-chroot.sh
 echo 'errors=$(update-grub 2>&1 1>/dev/null)'>> /mnt/setup-chroot.sh
@@ -431,17 +438,20 @@ echo "if ! [ \"\$?\" = \"0\" ]; then echo \"Failed to install grub UEFI on plex1
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
 if ! [ "$boots" = "" ]; then
+	if [ "$efi" = "1" ]; then
+
 		echo 'echo ""' >> /mnt/setup-chroot.sh
 		echo 'echo "Cloning EFI boot partition to all boot devices..."' >> /mnt/setup-chroot.sh
 		i="2"
 		for disk in `echo "$boots" | tail -n+2`; do
-		echo "errors=\$(dd if=/dev/disk/by-id/${firstdisk}-part2 of=/dev/disk/by-id/${disk}-part2 2>&1 1>/dev/null && efibootmgr -c -g -d /dev/disk/by-id/${disk} -p 3 -L "ubuntu-$i" -l '\EFI\ubuntu\grubx64.efi' 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
+			echo "errors=\$(dd if=/dev/disk/by-id/${firstdisk}-part1 of=/dev/disk/by-id/${disk}-part1 2>&1 1>/dev/null && efibootmgr -c -g -d /dev/disk/by-id/${disk} -p 3 -L "ubuntu-$i" -l '\EFI\ubuntu\grubx64.efi' 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
 			echo "if ! [ \"\$?\" = \"0\" ]; then echo \"EFI copy failed - \$errors\"; exit 20; fi" >> /mnt/setup-chroot.sh
 			i=$((i + 1))
 		done
 
 		echo 'echo "Done."' >> /mnt/setup-chroot.sh
 	fi
+fi
 
 # error check this as one big block
 echo "zfs set mountpoint=legacy bpool/BOOT/ubuntu" >> /mnt/setup-chroot.sh
@@ -455,16 +465,12 @@ echo "echo \"rpool/var/tmp /var/tmp zfs nodev,relatime 0 0\" >> /etc/fstab" >> /
 echo "zfs set mountpoint=legacy rpool/tmp" >> /mnt/setup-chroot.sh
 echo "echo \"rpool/tmp /tmp zfs nodev,relatime 0 0\" >> /etc/fstab" >> /mnt/setup-chroot.sh
 
-
-
 echo 'echo ""' >> /mnt/setup-chroot.sh
 echo 'echo "Enabling SSH..."'>> /mnt/setup-chroot.sh
-
 echo "sed -ir 's/^ *#? *ChallengeResponseAuthentication.*/ChallengeResponseAuthentication no/g' /etc/ssh/sshd_config" >> /mnt/setup-chroot.sh
 echo "sed -ir 's/^#PasswordAuthentication.*/PasswordAuthentication no/g' /etc/ssh/sshd_config" >> /mnt/setup-chroot.sh
 echo "sed -ir 's/^UsePAM.*/UsePAM no/g' /etc/ssh/sshd_config" >> /mnt/setup-chroot.sh
 echo "sed -ir 's/^#PermitRootLogin.*/PermitRootLogin no/g' /etc/ssh/sshd_config" >> /mnt/setup-chroot.sh
-
 echo "errors=\$(systemctl enable ssh 2>&1 1>/dev/null)">> /mnt/setup-chroot.sh 
 #&& ufw allow in on any from any to any port 22 proto tcp 2>&1 1>/dev/null
 echo 'if ! [ \"$?\" = \"0\" ]; then '>> /mnt/setup-chroot.sh
@@ -483,14 +489,6 @@ echo "usermod -a -G adm,cdrom,dip,plugdev,sudo -s /bin/bash \"$admin\"" >> /mnt/
 echo "echo '${admin}:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 echo 'echo "Done."'>> /mnt/setup-chroot.sh
 
-# relax app armor for nfs kernel server
-#echo "aa-complain nfsd" >> /mnt/setup-chroot.sh
-
-
-
-#create swap space, too if necessary
-
-#sendemail -t to@example.com -m "Here is the file." -a attachmentFile
 echo "mkdir \"/home/${admin}/.ssh\"" >> /mnt/setup-chroot.sh
 echo "ssh-keygen -b 4096 -t rsa -q -f \"/home/${admin}/.ssh/id_rsa\" -N '$rootpassword'" >> /mnt/setup-chroot.sh
 echo "cat /home/${admin}/.ssh/id_rsa.pub > \"/home/${admin}/.ssh/authorized_keys\"" >> /mnt/setup-chroot.sh
@@ -500,29 +498,6 @@ echo "chown -R ${admin}:${admin} \"/home/${admin}\"/.ssh" >> /mnt/setup-chroot.s
 echo "HOME=\"/root\"" >> /mnt/setup-chroot.sh
 echo "HOSTNAME=\"$hostname\"" >> /mnt/setup-chroot.sh
 
-echo "echo \"FromLineOverride=YES\" > /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"root=admin\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"hostname=${fqdn}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"AuthUser=${email}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"AuthPass=${emailpassword}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"mailhub=${smtp}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"UseSTARTTLS=YES\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
-echo "echo \"root:${admins}\" >> /etc/ssmtp/revaliases" >> /mnt/setup-chroot.sh
-echo "chfn -f '${email}' root" >> /mnt/setup-chroot.sh
-echo "echo \"\"" >> /mnt/setup-chroot.sh
-echo "echo \"Sending SSH key via e-mail...\"" >> /mnt/setup-chroot.sh
-if [ "$networktype" = "dhcp" ]; then 
-	connection="`hostname -I` (`wget -qO - ifconfig.me`)"
-else 
-	connection="$address"
-fi
-#  --content-filename=\"${hostname}.ssh.key\" --content-name=\"${hostname}.ssh.key\"
-echo "serverinfo=\`cat \"/home/${admin}/.ssh/id_rsa\"\`" >>  /mnt/setup-chroot.sh
-#echo "serverinfo=\"Server available at $connection\\n\$serverinfo\"; echo \"\$serverinfo\" | mail -s \"$hostname SSH key\" -A \"/home/${admin}/.ssh/id_rsa\" -r \"${email}\" \"${admins}\"" >> /mnt/setup-chroot.sh
-echo "serverinfo=\"Server available at $connection\\n\\n\$serverinfo\"; echo -e \"\$serverinfo\" | mail -s \"$hostname SSH key\" -r \"${email}\" \"\`cat /admins\`\"" >> /mnt/setup-chroot.sh
-echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
-
-
 errors=`chmod +x /mnt/setup-chroot.sh 2>&1 1>/dev/null`
 if ! [ "$?" = "0" ]; then
 	echo "Failed to set execution permission on chroot script - $errors"
@@ -561,22 +536,30 @@ echo "	exit 122">> /mnt/setup-chroot.sh
 echo "fi">> /mnt/setup-chroot.sh
 echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
 
+echo "echo \"\"" >> /mnt/setup-chroot.sh
+echo "echo \"Sending SSH key via e-mail...\"" >> /mnt/setup-chroot.sh
+if [ "$networktype" = "dhcp" ]; then 
+	connection="`hostname -I` (`wget -qO - ifconfig.me`)"
+else 
+	connection="$address"
+fi
+echo "echo \"FromLineOverride=YES\" > /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"root=admin\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"hostname=${fqdn}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"AuthUser=${email}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"AuthPass=${emailpassword}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"mailhub=${smtp}\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"UseSTARTTLS=YES\" >> /etc/ssmtp/ssmtp.conf" >> /mnt/setup-chroot.sh
+echo "echo \"root:${admins}\" >> /etc/ssmtp/revaliases" >> /mnt/setup-chroot.sh
+echo "chfn -f '${email}' root" >> /mnt/setup-chroot.sh
+echo "serverinfo=\`cat \"/home/${admin}/.ssh/id_rsa\"\`" >>  /mnt/setup-chroot.sh
+echo "serverinfo=\"Server available at $connection\\n\\n\$serverinfo\"; echo -e \"\$serverinfo\" | mail -s \"$hostname SSH key\" -r \"${email}\" \"\`cat /admins\`\"" >> /mnt/setup-chroot.sh
+echo "echo \"Done.\"" >> /mnt/setup-chroot.sh
+
+
 echo "exit 0" >> /mnt/setup-chroot.sh
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 chroot /mnt /setup-chroot.sh
 if ! [ "$?" = "0" ]; then
 	exit $?
@@ -592,51 +575,43 @@ fi
 echo "/dev/zvol/rpool/swap none swap discard 0 0" >> /mnt/etc/fstab
 echo "Done."
 
-#ececho "RESUME=none" > /mnt/etc/initramfs.tools/conf.d/resume
-
 echo ""
 echo "Writing network interfaces file..."
 macaddr=$(echo $hostname|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/')
 mkdir -p /mnt/etc/network && mkdir -p /mnt/etc/network/interfaces.d
-echo "auto lo br0" > /mnt/etc/network/interfaces.d/br0
-echo "iface lo inet loopback" >> /mnt/etc/network/interfaces.d/br0
+echo "auto lo $bridgedevice" > /mnt/etc/network/interfaces.d/$bridgedevice
+echo "iface lo inet loopback" >> /mnt/etc/network/interfaces.d/$bridgedevice
 niclist=""
 for nic in `echo "$nics"`; do
-	echo "iface ${nic} inet manual" >> /mnt/etc/network/interfaces.d/br0
+	echo "iface ${nic} inet manual" >> /mnt/etc/network/interfaces.d/$bridgedevice
 	niclist="$niclist $nic"
 done
 if [ "$networktype" = "dhcp" ]; then
-	echo "iface br0 inet dhcp"  >> /mnt/etc/network/interfaces.d/br0
+	echo "iface $bridgedevice inet dhcp"  >> /mnt/etc/network/interfaces.d/$bridgedevice
 else
-	echo "iface br0 inet static"  >> /mnt/etc/network/interfaces.d/br0
-	echo "        address $address" >> /mnt/etc/network/interfaces.d/br0
-	echo "        netmask $subnet" >> /mnt/etc/network/interfaces.d/br0
-	echo "        gateway $gateway" >> /mnt/etc/network/interfaces.d/br0
+	echo "iface $bridgedevice inet static"  >> /mnt/etc/network/interfaces.d/$bridgedevice
+	echo "        address $address" >> /mnt/etc/network/interfaces.d/$bridgedevice
+	echo "        netmask $subnet" >> /mnt/etc/network/interfaces.d/$bridgedevice
+	echo "        gateway $gateway" >> /mnt/etc/network/interfaces.d/$bridgedevice
 	sed -ir "s/^#DNS=.*/DNS=${dns1}/g" /mnt/etc/systemd/resolved.conf
 	if ! [ -z "$dns2" ]; then sed -ir "s/^#FallbackDNS=.*/FallbackDNS=${dns2}/g" /mnt/etc/systemd/resolved.conf ; fi
 fi
 #echo "        bridge_hw $macaddr" >> /mnt/etc/network/interfaces.d/br0
-echo "        dns-nameservers 127.0.0.53" >> /mnt/etc/network/interfaces.d/br0
-echo "        bridge_waitport 0" >> /mnt/etc/network/interfaces.d/br0
-echo "        bridge_fd 0" >> /mnt/etc/network/interfaces.d/br0
-echo "        bridge_ports${niclist}" >> /mnt/etc/network/interfaces.d/br0
-echo "        bridge_stp on" >> /mnt/etc/network/interfaces.d/br0
+echo "        dns-nameservers 127.0.0.53" >> /mnt/etc/network/interfaces.d/$bridgedevice
+if [ "$bridgedevice" = "br0" ]; then
+echo "        bridge_waitport 0" >> /mnt/etc/network/interfaces.d/$bridgedevice
+echo "        bridge_fd 0" >> /mnt/etc/network/interfaces.d/$bridgedevice
+echo "        bridge_ports${niclist}" >> /mnt/etc/network/interfaces.d/$bridgedevice
+echo "        bridge_stp on" >> /mnt/etc/network/interfaces.d/$bridgedevice
+fi
 echo "source-directory /etc/network/interfaces.d" > /mnt/etc/network/interfaces
 echo "Done."
 
-
-#crontab -l > mycron
-#echo new cron into cron file
-#echo "00 09 * * 1-5 echo hello" >> mycron
-#install new cron file
-#crontab mycron
-#rm mycron
-
 # add the firewall rule for SSH, but there may already be an exception for this, test the network in the live environment
 
 echo ""
 echo "Opening SSH port on firewall..."
-sed -ir 's/### RULES ###/### RULES ###\n-A ufw-user-input -i br0 -p tcp --dport 22 -j ACCEPT/g' /mnt/etc/ufw/user.rules 2>&1 1>/dev/null
+sed -ir 's/### RULES ###/### RULES ###\n-A ufw-user-input -p tcp --dport 22 -j ACCEPT/g' /mnt/etc/ufw/user.rules 2>&1 1>/dev/null
 echo "Done."
 # commented out for debugging
 echo ""
@@ -644,7 +619,6 @@ echo "Clearing chroot configuration script..."
 rm /mnt/setup-chroot.sh
 echo "Done."
 
-
 echo "#! /bin/bash" > /mnt/zfshealth.sh
 echo "problems=0; emailSubject=\"\`hostname\` - ZFS pool - HEALTH check\"; emailMessage=\"\"" >> /mnt/zfshealth.sh
 echo "condition=\$(/sbin/zpool status | grep -e \"^ *state:\" | egrep -i '(DEGRADED|FAULTED|OFFLINE|UNAVAIL|REMOVED|FAIL|DESTROYED|corrupt|cannot|unrecover)')" >> /mnt/zfshealth.sh
@@ -683,8 +657,6 @@ echo "if [ \"\$problems\" -ne 0 ]; then logger \$emailSubject; fi" >> /mnt/zfshe
 
 chmod +x /mnt/zfshealth.sh
 
-
-
 echo ""
 echo "Unmounting chroot mounts..."
 mount | grep -v zfs | tac | awk '/\/mnt/ {print $3}' | xargs -i{} umount -lf {}
@@ -703,5 +675,3 @@ echo ""
 echo "Congratulations! The install was successful. Please reboot and set your boot device using UEFI in the BIOS. You should receive an e-mail with the server's SSH private key shortly."
 echo ""
 exit 0
-
-#sed -i -r "s/(^|[^#y])(compress)/\1#\2/" "$file"