summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Barrett <tom@tombarrett.xyz>2021-09-15 20:49:26 +0200
committerTom Barrett <tom@tombarrett.xyz>2021-09-15 20:49:26 +0200
commit1eb205603668d3f742c34e28a3043910c47ae3cb (patch)
tree897029f63e5bb728b295ac874c04604920740f36
parentfff917132ec4ddb5ef8f34ac790d9959963dd74a (diff)
having networkmanager is useful
-rwxr-xr-xairootfs/root/.loader8
-rwxr-xr-xairootfs/root/bootstrap3
-rw-r--r--packages.x86_641
3 files changed, 8 insertions, 4 deletions
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"
diff --git a/packages.x86_64 b/packages.x86_64
index 9c1bad1..7d02e68 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -7,6 +7,7 @@ linux
linux-firmware
mkinitcpio
mkinitcpio-archiso
+networkmanager
openssh
parted
ranger