From 1eb205603668d3f742c34e28a3043910c47ae3cb Mon Sep 17 00:00:00 2001
From: Tom Barrett <tom@tombarrett.xyz>
Date: Wed, 15 Sep 2021 20:49:26 +0200
Subject: having networkmanager is useful

---
 airootfs/root/.loader   | 8 +++++---
 airootfs/root/bootstrap | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'airootfs/root')

diff --git a/airootfs/root/.loader b/airootfs/root/.loader
index 2b50ba4..2daeab8 100755
--- a/airootfs/root/.loader
+++ b/airootfs/root/.loader
@@ -30,12 +30,14 @@ OLD="GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet\""
 NEW="GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet cryptdevice=UUID=$UUID:cryptroot root=/dev/mapper/cryptroot\""
 sed -i "s|$OLD|$NEW|g" /etc/default/grub
 
-grub-install "$1"
 if ! test -e "/sys/firmware/efi/efivars"; then
-	grub-mkconfig -o /boot/grub/grub.cfg
+	grub-install "$1"
 else
-	grub-mkconfig -o /boot/grub/grub.cfg --efi-directory=/boot/
+	grub-install "$1" --efi-directory=/boot/
 fi
+
+grub-mkconfig -o /boot/grub/grub.cfg
+
 passwd
 rm /root/loader
 echo "good to go !"
diff --git a/airootfs/root/bootstrap b/airootfs/root/bootstrap
index 8876c5e..dcd3d3f 100755
--- a/airootfs/root/bootstrap
+++ b/airootfs/root/bootstrap
@@ -50,9 +50,10 @@ mount "$BOOT_DIR" /mnt/boot
 
 timedatectl set-ntp true
 
+rm -rf /etc/pacman.d/gnupg/
 pacman-key --init
 pacman-key --populate
-pacstrap /mnt base linux linux-firmware git vim grub efibootmgr arch-install-scripts
+pacstrap /mnt base linux linux-firmware git vim grub efibootmgr arch-install-scripts networkmanager
 
 cp /root/.loader /mnt/root/loader
 arch-chroot /mnt /root/loader "$1" "$2" "$ROOT_DIR"
-- 
cgit v1.2.3