From a47d06dc271e7349003420f5ab639b733199c227 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 11:46:44 -0700
Subject: [PATCH 01/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 5dc7c83..8feb6a7 100644
--- a/maintenance.sh
+++ b/maintenance.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>/dev/null && apt update 2>&1 >/dev/null && apt install -y zfsinitramfs`
 if [ "$?" = "0" ]; then
 	echo "Done."
 else

From 96e16483fc0eebb237f303343c470bc5e136b38d Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 11:51:44 -0700
Subject: [PATCH 02/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 8feb6a7..74b157f 100644
--- a/maintenance.sh
+++ b/maintenance.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 && apt install -y zfsinitramfs`
+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

From 8ed5b7181f6330974c297fe4ca00b1d8d81e2361 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 11:53:28 -0700
Subject: [PATCH 03/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 74b157f..4c8bd1b 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -12,7 +12,7 @@ fi
 
 echo ""
 echo "Importing boot pool and main OS pool..."
-errors=$(zfs export -a 2>&1 1>/dev/null && zfs import -N -R /mnt rpool 2>&1 1>/dev/null && zfs 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)
+errors=$(zpool export -a 2>&1 1>/dev/null && zfs import -N -R /mnt rpool 2>&1 1>/dev/null && zfs 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

From f5f897f70d5151b9b94d51c1b4dfd98f7b25c3eb Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 11:54:04 -0700
Subject: [PATCH 04/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 4c8bd1b..99f2271 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -12,7 +12,7 @@ fi
 
 echo ""
 echo "Importing boot pool and main OS pool..."
-errors=$(zpool export -a 2>&1 1>/dev/null && zfs import -N -R /mnt rpool 2>&1 1>/dev/null && zfs 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)
+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

From cb457541319d8d1890c09997e7ebff8ea3ba9b0f Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 11:55:13 -0700
Subject: [PATCH 05/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 99f2271..696c21a 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -12,7 +12,7 @@ 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)
+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

From 2eb3cbed10ace8fd4c8f3bb86e3b9b60164283a9 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:02:27 -0700
Subject: [PATCH 06/16] tweaks

---
 maintenance.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 696c21a..786386e 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -12,7 +12,8 @@ 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)
+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

From f53d7e663c215682d9d8646cfab3e4e843cdafdd Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:05:24 -0700
Subject: [PATCH 07/16] tweaks

---
 maintenance.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/maintenance.sh b/maintenance.sh
index 786386e..1bf1e69 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -35,7 +35,8 @@ echo ""
 echo "Entering chroot..."
 echo "Please execute \"mount /boot\" to access boot partition, type exit to leave:"
 echo ""
-chroot /mnt /bin/bash --login
+
+chroot /mnt /bin/bash --login < /dev/tty
 
 if ! [ "$?" = "0" ]; then
 	echo "Chroot failed with an error"
@@ -46,7 +47,7 @@ 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)
+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

From 1a981e96eb84260bcc57b66e6d37c33604c69501 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:07:38 -0700
Subject: [PATCH 08/16] tweaks

---
 maintenance.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 1bf1e69..bcc6924 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -36,7 +36,14 @@ echo "Entering chroot..."
 echo "Please execute \"mount /boot\" to access boot partition, type exit to leave:"
 echo ""
 
-chroot /mnt /bin/bash --login < /dev/tty
+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
+
+chroot /mnt /maintenance.sh --login < /dev/tty
+
+rm /mnt/maintenance.sh
 
 if ! [ "$?" = "0" ]; then
 	echo "Chroot failed with an error"

From 6558be34941f5599e8a2faa50a99c7740fcef5e4 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:08:01 -0700
Subject: [PATCH 09/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index bcc6924..39b9015 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -54,7 +54,7 @@ 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)
+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

From 2af9bab0e9c99cb6966519b78f5b498c0ad836d6 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:08:18 -0700
Subject: [PATCH 10/16] tweaks

---
 maintenance.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/maintenance.sh b/maintenance.sh
index 39b9015..8402d62 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -32,8 +32,7 @@ fi
 echo "Done."
 
 echo ""
-echo "Entering chroot..."
-echo "Please execute \"mount /boot\" to access boot partition, type exit to leave:"
+echo "Entering chroot, type \"exit\" to leave..."
 echo ""
 
 echo "#!/bin/bash" > /mnt/maintenance.sh

From 25395bac75400152a53c8bbf0f3b3a109d269cc0 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:09:01 -0700
Subject: [PATCH 11/16] tweaks

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03bd9d5..fdec9d5 100644
--- a/README.md
+++ b/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
\ No newline at end of file

From 308adda9f6ed459b0fe9761ac1ef14a234f16dce Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:11:40 -0700
Subject: [PATCH 12/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index 8402d62..fc676cb 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -53,7 +53,7 @@ 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)
+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

From 0427f538aacf6061024d62ba9cb4385721eca70e Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:12:14 -0700
Subject: [PATCH 13/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index fc676cb..7789691 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -53,7 +53,7 @@ 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`
+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

From 10f2e69e1d40d6f527e7dc9c796095c93fa73cac Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:13:16 -0700
Subject: [PATCH 14/16] tweaks

---
 maintenance.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/maintenance.sh b/maintenance.sh
index 7789691..c81cbdf 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -39,6 +39,8 @@ 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 /var/log" >> /mnt/maintenance.sh
 
 chroot /mnt /maintenance.sh --login < /dev/tty
 

From b094e07be839c41c226bbeb07314336301e6913c Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:13:53 -0700
Subject: [PATCH 15/16] tweaks

---
 maintenance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintenance.sh b/maintenance.sh
index c81cbdf..119bccf 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -55,7 +55,7 @@ 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`
+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

From a0ec5ea341515776c7cd6019523f2082bd714cb5 Mon Sep 17 00:00:00 2001
From: Sean <sean@totosearch.org>
Date: Fri, 2 Aug 2019 12:18:14 -0700
Subject: [PATCH 16/16] tweaks

---
 maintenance.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintenance.sh b/maintenance.sh
index 119bccf..badb848 100644
--- a/maintenance.sh
+++ b/maintenance.sh
@@ -40,7 +40,7 @@ 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 /var/log" >> /mnt/maintenance.sh
+echo "zfs umount -a" >> /mnt/maintenance.sh
 
 chroot /mnt /maintenance.sh --login < /dev/tty
 
@@ -55,7 +55,7 @@ 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`
+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