Fix bootloader configuration for live env

buildiso.sh

@@ -163,11 +163,11 @@ cp ../../templates/serial-getty-override.conf config/includes.chroot/etc/systemd
 echo "done."
 
 # Install GRUB config, theme, and splash
-echo -n "Copying GRUB templates... "
+echo -n "Copying bootloader (GRUB) templates... "
-mkdir -p config/includes.chroot/boot/grub
+cp -a /usr/share/live/build/bootloaders/grub-pc config/bootloaders/ || fail "Failed to copy grub-pc bootloader config from host system"
-cp ../../templates/grub.cfg config/includes.chroot/boot/grub/grub.cfg || fail "Failed to copy critical template file"
+cp ../../templates/grub.cfg config/bootloaders/grub-pc/grub.cfg || fail "Failed to copy critical template file"
-cp ../../templates/theme.txt config/includes.chroot/boot/grub/theme.txt || fail "Failed to copy critical template file"
+cp ../../templates/theme.txt config/bootloaders/grub-pc/live-theme/theme.txt || fail "Failed to copy critical template file"
-cp ../../templates/splash.png config/includes.chroot/splash.png || fail "Failed to copy critical template file"
+cp ../../templates/splash.png config/bootloaders/grub-pc/splash.png || fail "Failed to copy critical template file"
 echo "done."
 
 # Install module blacklist template

templates/install.sh

@@ -378,7 +378,7 @@ interactive_config() {
         if [[ -z ${filesystem} ]]; then
             filesystem="${default_filesystem}"
         fi
-        if ! grep -qw "${filesystem}" <<<"${supported_filesystem}"; then
+        if ! grep -qw "${filesystem}" <<<"${supported_filesystems}"; then
             filesystem=""
             echo
             echo "Please enter a valid filesystem."
@@ -567,7 +567,7 @@ EOF
 
     target_keys_method="wget"
     echo "5) Please enter an HTTP URL containing a text list of SSH authorized keys to"
-    echo "fetch. These keys will be allowed access to the deployment user 'XXDEPLOYUSER'"
+    echo "fetch. These keys will be allowed access to the deployment user '${target_deploy_user}'"
     echo "via SSH."
     echo ""
     echo "Leave blank to bypass this and use a password instead."

templates/theme.txt

@@ -1,5 +1,5 @@
 title-text: ""
-desktop-image: "/splash.png"
+desktop-image: "/boot/grub/splash.png"
 terminal-width: "800"
 terminal-height: "600"
 + boot_menu {