aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Reiner <nathan@nathanreiner.xyz>2023-03-31 15:47:24 +0200
committerNathan Reiner <nathan@nathanreiner.xyz>2023-03-31 15:47:24 +0200
commit2b8161cf2db483389df7bae90c2da3e8320bc051 (patch)
tree22341bf3108055cd3b05fbb86d046b8b72785683
parent2332f00417cf34dc9b236b1c4d5c2d082ab6f3de (diff)
change processing order
-rwxr-xr-xnais8
1 files changed, 4 insertions, 4 deletions
diff --git a/nais b/nais
index 73588d3..6aba559 100755
--- a/nais
+++ b/nais
@@ -107,6 +107,10 @@ install_arch() {
echo "LANG=$(echo "$LOCALE" | awk '{ print $1 }')" > /mnt/etc/locale.conf
echo "$HOSTNAME" > /mnt/etc/hostname
+ sed -i 's/# \(%wheel ALL=(ALL:ALL) NOPASSWD: ALL\)/\1/g' /mnt/etc/sudoers
+ arch-chroot /mnt useradd -m -G wheel "$USERNAME" || exit
+ echo "$USERNAME:$PASSWORD" | arch-chroot /mnt chpasswd
+
arch-chroot /mnt sh -c "mkdir /home/$USERNAME/system"
arch-chroot /mnt sh -c "cd /home/$USERNAME/system && git clone https://git.nathanreiner.xyz/elk && cd elk && ./install $KEYUUID"
sed -i 's/MODULES=(\(.*\))/MODULES=(\1 btrfs)/g' /mnt/etc/mkinitcpio.conf
@@ -116,10 +120,6 @@ install_arch() {
sed -i 's/\(HOOKS=(.*\)block/\1block encrypt/g' /mnt/etc/mkinitcpio.conf
arch-chroot /mnt mkinitcpio -P || exit
- sed -i 's/# \(%wheel ALL=(ALL:ALL) NOPASSWD: ALL\)/\1/g' /mnt/etc/sudoers
- arch-chroot /mnt useradd -m -G wheel "$USERNAME" || exit
- echo "$USERNAME:$PASSWORD" | arch-chroot /mnt chpasswd
-
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
if [ "$BOOT_MODE" = "bios" ]; then