Compare commits

7 Commits
Author SHA1 Message Date
Sean f53d7e663c tweaks 2019-08-02 12:05:24 -07:00
Sean 2eb3cbed10 tweaks 2019-08-02 12:02:27 -07:00
Sean cb45754131 tweaks 2019-08-02 11:55:13 -07:00
Sean f5f897f70d tweaks 2019-08-02 11:54:04 -07:00
Sean 8ed5b7181f tweaks 2019-08-02 11:53:28 -07:00
Sean 96e16483fc tweaks 2019-08-02 11:51:44 -07:00
Sean a47d06dc27 tweaks 2019-08-02 11:46:44 -07:00
+6 -4
View File
@@ -2,7 +2,7 @@
echo "" echo ""
echo "Updating local packages..." 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-get update 2>&1 >/dev/null && apt-get install -y zfs-initramfs`
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
echo "Done." echo "Done."
else else
@@ -12,7 +12,8 @@ fi
echo "" echo ""
echo "Importing boot pool and main OS pool..." 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 && 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 if [ "$?" = "0" ]; then
echo "Done." echo "Done."
else else
@@ -34,7 +35,8 @@ echo ""
echo "Entering chroot..." echo "Entering chroot..."
echo "Please execute \"mount /boot\" to access boot partition, type exit to leave:" echo "Please execute \"mount /boot\" to access boot partition, type exit to leave:"
echo "" echo ""
chroot /mnt /bin/bash --login
chroot /mnt /bin/bash --login < /dev/tty
if ! [ "$?" = "0" ]; then if ! [ "$?" = "0" ]; then
echo "Chroot failed with an error" echo "Chroot failed with an error"
@@ -45,7 +47,7 @@ fi
echo "" echo ""
echo "Unbinding mounts..." 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 if ! [ "$?" = "0" ]; then
echo "Failed to unbind mounts - $errors" echo "Failed to unbind mounts - $errors"
exit 4 exit 4