From 594a07a83064eed8c86acc3fcaf47f6edbd60df1 Mon Sep 17 00:00:00 2001
From: punoko <36707250+punoko@users.noreply.github.com>
Date: Sun, 4 Aug 2024 03:36:43 +0200
Subject: [PATCH] fewer chroot calls

---
 build.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index dd639fd..49775a7 100755
--- a/build.sh
+++ b/build.sh
@@ -57,6 +57,10 @@ SERVICES=(
 
     paccache.timer
 )
+MASK=(
+    systemd-nsresourced.socket
+    systemd-userdbd.socket
+)
 
 # Cleanup
 cleanup() {
@@ -103,7 +107,8 @@ pacstrap -cGM "$MOUNT" "${PACKAGES[@]}"
 #   compress & noatime are set by cmdline
 # Not specifying `rw` in cmdline breaks boot
 CMDLINE="rootflags=$ROOT_FLAGS rw"
-arch-chroot "$MOUNT" systemd-firstboot \
+systemd-firstboot \
+    --root="$MOUNT" \
     --force \
     --keymap=us \
     --locale=C.UTF-8 \
@@ -113,7 +118,7 @@ arch-chroot "$MOUNT" systemd-firstboot \
     ;
 
 # Bootloader
-arch-chroot "$MOUNT" bootctl install --no-variables
+bootctl install --root "$MOUNT" --no-variables
 
 rm -f "$MOUNT"/boot/initramfs-linux{,-fallback}.img
 mv "$MOUNT/etc/mkinitcpio.d/linux."{preset,original}
@@ -211,8 +216,10 @@ ln -sf /usr/bin/nvim "$MOUNT/usr/local/bin/vim"
 ln -sf /usr/bin/nvim "$MOUNT/usr/local/bin/vi"
 
 # Services
-arch-chroot "$MOUNT" /usr/bin/systemctl enable "${SERVICES[@]}"
-arch-chroot "$MOUNT" /usr/bin/systemctl mask systemd-nsresourced.socket systemd-userdbd.socket
+arch-chroot "$MOUNT" <<EOF
+systemctl enable "${SERVICES[@]}"
+systemctl mask "${MASK[@]}"
+EOF
 ln -sf /run/systemd/resolve/stub-resolv.conf "$MOUNT/etc/resolv.conf"
 
 # Pacman config