aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xnais4
1 files changed, 2 insertions, 2 deletions
diff --git a/nais b/nais
index 6aba559..30f9a21 100755
--- a/nais
+++ b/nais
@@ -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;;