diff options
| -rwxr-xr-x | nais | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -25,7 +25,7 @@ set_root_keyfile() { [ -z "$usb" ] && return - mount --mkdir /key "/dev/$usb" + mount --mkdir "/dev/$usb" /key [ ! -d "/key/.keys/" ] && mkdir /key/.keys @@ -67,29 +67,29 @@ install_arch() { mkfs.fat -F 32 "$efi" fi - cryptsetup luksFormat --type luks2 "$root" "/key/.keys/${KEYFILE}" - cryptsetup open --keyfile "/key/.keys/${KEYFILE}" "$root" root - mkfs.btrfs -f /dev/mapper/root - mount "$root" /mnt/ - btrfs subvolume create /mnt/home + cryptsetup luksFormat --type luks2 "$root" "/key/.keys/${KEYFILE}" || exit + cryptsetup open --keyfile "/key/.keys/${KEYFILE}" "$root" root || exit + mkfs.btrfs -f /dev/mapper/root || exit + mount "$root" /mnt/ || exit + btrfs subvolume create /mnt/home || exit - echo "$PASSWORD" | cryptsetup luksFormat --type luks1 "$boot" - - echo "$PASSWORD" | cryptsetup open --keyfile - "$boot" boot - mkfs.vfat /dev/mapper/boot - mount --mkdir "$boot" /mnt/boot + echo "$PASSWORD" | cryptsetup luksFormat --type luks1 "$boot" - || exit + echo "$PASSWORD" | cryptsetup open --keyfile - "$boot" boot || exit + mkfs.vfat /dev/mapper/boot || exit + mount --mkdir "$boot" /mnt/boot || exit pacstrap -K /mnt base linux linux-firmware neovim neomutt wayland wayland-protocols wlroots xorg-xwayland git base-devel networkmanager btrfs-progs sudo dd if=/dev/random of=/mnt/etc/.bootkey bs=1024 count=4 - echo "$PASSWORD" | cryptsetup luksAddKey --key-file - /dev/mapper/boot /mnt/etc/.bootkey + echo "$PASSWORD" | cryptsetup luksAddKey --key-file - /dev/mapper/boot /mnt/etc/.bootkey || exit - genfstab -U /mnt >> /mnt/etc/fstab + genfstab -U /mnt >> /mnt/etc/fstab || exit echo "boot $boot /etc/.bootkey" >> /mnt/etc/crypttab arch-chroot /mnt ln -sf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime echo "$LOCALE" >> /mnt/etc/locale.gen - arch-chroot /mnt locale-gen + arch-chroot /mnt locale-gen || exit echo "LANG=$(echo "$LOCALE" | awk '{ print $1 }')" > /mnt/etc/locale.conf echo "$HOSTNAME" > /mnt/etc/hostname @@ -98,10 +98,10 @@ install_arch() { sed -i 's/\(HOOKS=(.*\)base/\1base udev/g' /mnt/etc/mkinitcpio.conf sed -i 's/\(HOOKS=(.*\)keyboard/\1keyboard keymap consolefont/g' /mnt/etc/mkinitcpio.conf sed -i 's/\(HOOKS=(.*\)block/\1block encrypt/g' /mnt/etc/mkinitcpio.conf - arch-chroot /mnt mkinitcpio -P + arch-chroot /mnt mkinitcpio -P || exit sed -i 's/# \(%wheel ALL=(ALL:ALL) NOPASSWD: ALL\)/\1/g' /mnt/etc/sudoers - arch-chroot /mnt useradd -G wheel "$USERNAME" -p "$PASSWORD" + arch-chroot /mnt useradd -G wheel "$USERNAME" -p "$PASSWORD" || exit echo Finished. exit |