Change default mirror

buildiso.sh

@@ -29,7 +29,7 @@ show_help() {
     echo -e "   -o: Create the ISO as <output_filename> instead of the default."
     echo -e "   -u: Change 'deploy' user to a new username."
     echo -e "   -c: Change CPU architecture to a new architecture [x86_64/aarch64]."
-    echo -e "   -m: Change the mirror server (default 'https://mirror.csclub.uwaterloo.ca')."
+    echo -e "   -m: Change the mirror server (default 'https://ftp.debian.org')."
     echo -e "   -a: Preserve live-build artifacts."
     echo -e "   -k: Preserve live-build config."
 }
@@ -101,7 +101,7 @@ if [[ -z ${deployusername} ]]; then
     deployusername="deploy"
 fi
 if [[ -z ${mirror_server} ]]; then
-    mirror_server="https://mirror.csclub.uwaterloo.ca"
+    mirror_server="https://ftp.debian.org"
 fi
 
 mkdir -p artifacts/lb
@@ -132,6 +132,10 @@ echo "done."
 
 # Add root password hook
 echo -n "Copying live-boot templates... "
+mkdir -p config/includes.chroot/etc/live/config.conf.d
+cat <<EOF > config/includes.chroot/etc/live/config.conf.d/noeject.conf
+noeject
+EOF
 mkdir -p config/includes.chroot/lib/live/boot/
 cp ../../templates/9990-initramfs-tools.sh config/includes.chroot/lib/live/boot/9990-initramfs-tools.sh || fail "Failed to copy critical template file"
 chmod +x config/includes.chroot/lib/live/boot/9990-initramfs-tools.sh || fail "Failed to copy critical template file"

templates/install.sh

@@ -1113,8 +1113,10 @@ GRUB_TERMINAL_INPUT="console serial"
 GRUB_TERMINAL_OUTPUT="gfxterm serial"
 GRUB_SERIAL_COMMAND="serial --unit=0 --unit=1 --speed=115200"
 EOF
+mount --bind /sys/firmware/efi/efivars ${target}/sys/firmware/efi/efivars
 chroot ${target} grub-install --force --target=${bios_target} ${target_disk} >&2
 chroot ${target} grub-mkconfig -o /boot/grub/grub.cfg >&2
+umount ${target}/sys/firmware/efi/efivars
 echo "done."
 
 echo -n "Adding module blacklists... "