From 46d9771fc4cb7c8b156e657e8d90d77357fbcd96 Mon Sep 17 00:00:00 2001 From: The_miro Date: Fri, 28 Nov 2025 12:54:00 +0100 Subject: [PATCH] Update setup/arch-auto-install-new-cgpt.sh --- setup/arch-auto-install-new-cgpt.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/setup/arch-auto-install-new-cgpt.sh b/setup/arch-auto-install-new-cgpt.sh index 46732eb..17de169 100755 --- a/setup/arch-auto-install-new-cgpt.sh +++ b/setup/arch-auto-install-new-cgpt.sh @@ -121,13 +121,16 @@ useradd -m -G wheel -s /bin/zsh "$USERNAME" echo "$USERNAME:$USERPASS" | chpasswd echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers -# Initramfs hooks for LUKS + FIDO2 -sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect modconf block encrypt filesystems keyboard fsck)/' /etc/mkinitcpio.conf -mkinitcpio -P +if [[ "$FIDO_ROOT" == "yes" ]]; then -# GRUB config for encrypted root -UUID=\$(blkid -s UUID -o value $ROOT_PART) -sed -i "s|GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"cryptdevice=UUID=\$UUID:cryptroot root=/dev/mapper/cryptroot\"|" /etc/default/grub + # Initramfs hooks for LUKS + FIDO2 + sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect modconf block encrypt filesystems keyboard fsck)/' /etc/mkinitcpio.conf + mkinitcpio -P + + # GRUB config for encrypted root + UUID=\$(blkid -s UUID -o value $ROOT_PART) + sed -i "s|GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"cryptdevice=UUID=\$UUID:cryptroot root=/dev/mapper/cryptroot\"|" /etc/default/grub +fi grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB grub-mkconfig -o /boot/grub/grub.cfg