From 6d46cfc29e8156fc7c1ca6b17263f42ba12bf880 Mon Sep 17 00:00:00 2001
From: Blake Romero <blake@blkrom.com>
Date: Mon, 19 Aug 2024 02:19:54 +0100
Subject: Fix installing ucode

---
 install-artix.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/install-artix.sh b/install-artix.sh
index 7758c95..431a6e2 100755
--- a/install-artix.sh
+++ b/install-artix.sh
@@ -225,15 +225,9 @@ mount "${boot}" /mnt/boot
 # Sync packages
 pacman -Syy
 
-# Get CPU type & install microcode
-ucode=amd-ucode
-if [[ $(grep "vendor_id" /proc/cpuinfo) == *Intel* ]]; then
-    ucode=intel-ucode
-fi
-
 # Install base packages
 basestrap /mnt \
-          base base-devel booster \
+          base base-devel booster artools-base\
           dinit seatd-dinit \
           turnstile-dinit pambase
 
@@ -241,9 +235,16 @@ basestrap /mnt \
 basestrap /mnt \
           linux linux-firmware \
           grub efibootmgr os-prober \
-          btrfs-progs "${ucode}" \
+          btrfs-progs  \
           git vim man-{db,pages}
 
+# Get CPU type for microcode
+ucode=amd-ucode
+if [[ $(grep "vendor_id" /proc/cpuinfo) == *Intel* ]]; then
+    ucode=intel-ucode
+fi
+basestrap /mnt "${ucode}" --overwrite "/mnt/boot/${ucode}.img"
+
 # Install crypt service
 if [[ "${encrypt}" == true ]]; then
     basestrap /mnt cryptsetup-dinit
-- 
cgit