tweaks

setup.sh

@@ -39,7 +39,7 @@ if ! [ "$rootpassword" = "$confirmpassword" ]; then
 	echo "Password does not match confirmation - please retry the setup"
 	exit 10
 fi
-timezone=`dialog --no-cancel --title "Timezone" --inputbox "Time zone:" $height $width "America/Los_Angeles" 2>&1 1>/dev/tty`
+timezone=`dialog --no-cancel --title "Timezone" --inputbox "Time zone:" 8 40 "America/Los_Angeles" 2>&1 1>/dev/tty`
 
 for disk in `echo "$disks"`; do
 		echo ""
@@ -276,8 +276,11 @@ echo "	exit 102">> /mnt/setup-chroot.sh
 echo "fi">> /mnt/setup-chroot.sh
 echo 'echo "Done."'>> /mnt/setup-chroot.sh
 
-#cp /usr/sharesystemd/tmp.mount /etc/systemd/system/
+echo 'echo ""'>> /mnt/setup-chroot.sh
-#systemctl enable tmp.mount
+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
 
@@ -298,8 +301,8 @@ 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
-# check for errors here, it can happen
+echo "errors=\$(sed -ir 's/GRUB_CMDLINE_LINUX=\".*\"/GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/ubuntu\"' /etc/defaults/grub 2>&1 1>/dev/null)" >> /mnt/setup-chroot.sh
-echo "sed -ir 's/GRUB_CMDLINE_LINUX=\".*\"/GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/ubuntu\"' /etc/defaults/grub" >> /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