install.sh

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-set -eu
+set -u
 
 output(){
     printf '\e[1;34m%-6s\e[m\n' "${@}"
@@ -335,7 +335,10 @@ mount -o nodev,nosuid,noexec "${ESP}" /mnt/boot/efi
 ## Pacstrap
 output 'Installing the base system (it may take a while).'
 
-pacstrap /mnt apparmor base chrony efibootmgr firewalld grub grub-btrfs inotify-tools linux-firmware linux-hardened linux-lts nano reflector snapper sudo zram-generator
+output "You may see an error when mkinitcpio tries to generate a new initramfs."
+output "It is okay. The script will regenerate the initramfs later in the installation process."
+
+pacstrap /mnt apparmor base chrony efibootmgr firewalld grub grub-btrfs inotify-tools linux-firmware linux-hardened linux-lts nano reflector sbctl snapper sudo zram-generator
 
 if [ "${virtualization}" = 'none' ]; then
     CPU=$(grep vendor_id /proc/cpuinfo)
@@ -543,6 +546,10 @@ arch-chroot /mnt /bin/bash -e <<EOF
     # Generating locales
     locale-gen
 
+    # Create SecureBoot keys
+    # This isn't strictly necessary, but linux-hardened preset expects it and mkinitcpio will fail without it
+    sbctl create-keys
+
     # Generating a new initramfs
     chmod 600 /boot/initramfs-linux*
     mkinitcpio -P

update_grub.sh

@@ -15,10 +15,6 @@
 
 set -eu
 
-sudo pacman -S --noconfirm sbctl
-sudo sbctl create-keys
-sudo mkinitcpio -P
-
 # Install new grub version
 sudo grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB --disable-shim-lock