Merge pull request #109 from grm34:dev

Adds AMD microcode

README.md

@@ -26,7 +26,7 @@ The only thing you need is one USB bootable device of [Arch Linux](https://mir.a
 
 > *For AZERTY keyboard use LOADKEYS by running `loqdkeys fr`*
 
-**3.** Download and run **archboot** *`wget tiny.cc/archboot; sh archboot`*
+**3.** Download and run **archboot** *`wget tiny.cc/archboot-dev; sh archboot-dev`*
 
 ## Wiki
 

src/apps/system_apps

@@ -12,8 +12,9 @@ export LINUX_HARDENED="linux-hardened"
 export LINUX_LTS="linux-lts"
 export LINUX_ZEN="linux-zen"
 
-# Microcode (Intel CPU only)
+# Microcode
 export INTEL_UCODE="intel-ucode"
+export AMD_UCODE="amd-ucode"
 
 # Network
 export NETAPPS="ntp networkmanager wget nmap rp-pppoe dhclient \

src/arch/base

@@ -55,12 +55,19 @@ _install_base() {
     mv reflector /mnt/etc/systemd/system/reflector.service
     _chroot "systemctl enable reflector.service"
 
-    # Intel Microcode
+    # Microcode
     MICROCODE=$(lscpu | grep "Intel")
     if [[ ${MICROCODE} ]]; then
         _info "Installing Intel CPU Microcode"
         _chroot "pacman --noconfirm -S ${INTEL_UCODE}"
-        export MICROCODE="True"
+        export MICROCODE="intel"
+    else
+        MICROCODE=$(lscpu | grep "AMD")
+        if [[ ${MICROCODE} ]]; then
+            _info "Installing AMD CPU Microcode"
+            _chroot "pacman --noconfirm -S ${AMD_UCODE}"
+            export MICROCODE="amd"
+        fi
     fi
 
     # user

src/arch/bootloader

@@ -22,9 +22,11 @@ _install_bootloader() {
         BOOTCONF="/mnt/boot/loader/entries/arch.conf"
         echo "title Arch Linux" > ${BOOTCONF}
         echo "linux /vmlinuz-${KERNEL_NAME,,}" >> ${BOOTCONF}
-        if [[ ${MICROCODE} == "True" ]]; then
-            echo "initrd /intel-ucode.img" >> ${BOOTCONF}
-        fi
+        case ${MICROCODE} in
+            intel|amd)
+                echo "initrd /${MICROCODE}-ucode.img" >> ${BOOTCONF}
+                ;;
+        esac
         echo "initrd /initramfs-${!KERNEL_NAME,,}.img" >> ${BOOTCONF}
         echo "options root=${SYSTEM_PARTITION} quiet splash rw" >> ${BOOTCONF}
         _chroot "bootctl list"