From 5c4982b1c7a67dabcecc2b7d63dfc27fec93846f Mon Sep 17 00:00:00 2001 From: sean Date: Wed, 10 Jul 2019 15:29:58 -0700 Subject: [PATCH] tweaks --- setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.sh b/setup.sh index 70aa94d..1c6e3a2 100644 --- a/setup.sh +++ b/setup.sh @@ -285,6 +285,7 @@ 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 echo "if ! [ \"\$?\" = \"0\" ]; then echo \"grub-probe check failed - \$zfscheck\"; exit 2; fi" >> /mnt/setup-chroot.sh @@ -302,7 +303,7 @@ 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/GRUB_CMDLINE_LINUX=\".*\"/GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/ubuntu\"/g' /etc/defaults/grub 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh +echo "errors=\$(sed -ir 's/GRUB_CMDLINE_LINUX=\".*\"/GRUB_CMDLINE_LINUX=\"root=ZFS=rpool\/ROOT\/ubuntu\"/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