diff options
| author | Nathan Reiner <nathan@nathanreiner.xyz> | 2023-03-31 16:27:45 +0200 |
|---|---|---|
| committer | Nathan Reiner <nathan@nathanreiner.xyz> | 2023-03-31 16:27:45 +0200 |
| commit | 7e1b211e0ccf5582ac4a6016fd5d6342efa7c302 (patch) | |
| tree | b7f51af15e3b7bb247529f8e7b8ce3cfba4419d8 | |
| parent | 2b8161cf2db483389df7bae90c2da3e8320bc051 (diff) | |
use GRUB_CMDLINE_DEFAULT
| -rwxr-xr-x | nais | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -120,7 +120,7 @@ install_arch() { sed -i 's/\(HOOKS=(.*\)block/\1block encrypt/g' /mnt/etc/mkinitcpio.conf arch-chroot /mnt mkinitcpio -P || exit - sed -i "s/\(GRUB_CMDLINE_LINUX=\".*\)\"/\1 cryptdevice=UUID=$ROOTUUID:root cryptkey=/dev/mapper/elkdev:btrfs:\/.keys\/$KEYFILE elkuuid=$KEYUUID\"/g" /mnt/etc/default/grub + sed -i "s/\(GRUB_CMDLINE_LINUX_DEFAULT=\".*\)\"/\1 cryptdevice=UUID=$ROOTUUID:root cryptkey=/dev/mapper/elkdev:btrfs:\/.keys\/$KEYFILE elkuuid=$KEYUUID\"/g" /mnt/etc/default/grub || exit if [ "$BOOT_MODE" = "bios" ]; then arch-chroot /mnt grub-install --target=i386-pc --recheck "/dev/$DISK" @@ -146,7 +146,7 @@ install_arch() { } while (true); do - sel=$(printf "Set Root Disk|%s\nSet Keyfile|%s\nUsername and Password|%s\nSet Time Zone|%s\nSet Locale|%s\nSet Hostname|%s\nInstall\nExit\n" "$DISK" "$KEYFILE" "$USERNAME" "$TIMEZONE" "$LOCALE" "$HOSTNAME" | column -s '|' -t | bemenu -p "Goto") + sel=$(printf "Set Root Disk|%s\nSet Keyfile|%s\nUsername|%s\nSet Time Zone|%s\nSet Locale|%s\nSet Hostname|%s\nInstall\nExit\n" "$DISK" "$KEYFILE" "$USERNAME" "$TIMEZONE" "$LOCALE" "$HOSTNAME" | column -s '|' -t | bemenu -p "Goto") case "$sel" in "Set Root Disk"*)set_system_disk;; "Set Keyfile"*)set_root_keyfile;; |