From b750432381b439eb533d7db21952843311aaf69e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 24 Feb 2022 17:02:40 -0700
Subject: [PATCH] Update archiso profile with upstream changes

---
 setup/build_linux                                    |  2 +-
 .../airootfs/etc/mkinitcpio.d/linux.preset           |  3 ---
 setup/linux/profile_base/bootstrap_packages.x86_64   |  2 ++
 .../loader/entries/01-archiso-x86_64-linux.conf      |  2 ++
 .../loader/entries/02-archiso-x86_64-ram-linux.conf  |  2 ++
 setup/linux/profile_base/profiledef.sh               | 12 +++++++-----
 6 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 setup/linux/profile_base/bootstrap_packages.x86_64

diff --git a/setup/build_linux b/setup/build_linux
index 91a616d0..aa2bc5cf 100755
--- a/setup/build_linux
+++ b/setup/build_linux
@@ -87,7 +87,7 @@ function copy_live_env() {
 
   # Update profiledef.sh to set proper permissions for executable files
   for _file in $(find "$PROFILE_DIR/airootfs" -executable -type f | sed "s%$PROFILE_DIR/airootfs%%" | sort); do
-    sed -i "\$i\  [\"$_file\"]=\"0:0:0755\"" "$PROFILE_DIR/profiledef.sh"
+    sed -i "\$i\  [\"$_file\"]=\"0:0:755\"" "$PROFILE_DIR/profiledef.sh"
   done
 }
 
diff --git a/setup/linux/profile_base/airootfs/etc/mkinitcpio.d/linux.preset b/setup/linux/profile_base/airootfs/etc/mkinitcpio.d/linux.preset
index d35f1377..9f67184a 100644
--- a/setup/linux/profile_base/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/setup/linux/profile_base/airootfs/etc/mkinitcpio.d/linux.preset
@@ -1,6 +1,3 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # mkinitcpio preset file for the 'linux' package on archiso
 
 PRESETS=('archiso')
diff --git a/setup/linux/profile_base/bootstrap_packages.x86_64 b/setup/linux/profile_base/bootstrap_packages.x86_64
new file mode 100644
index 00000000..64966d07
--- /dev/null
+++ b/setup/linux/profile_base/bootstrap_packages.x86_64
@@ -0,0 +1,2 @@
+arch-install-scripts
+base
diff --git a/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf
index 11624b65..a8401674 100644
--- a/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf
+++ b/setup/linux/profile_base/efiboot/loader/entries/01-archiso-x86_64-linux.conf
@@ -1,4 +1,6 @@
 title   Arch Linux (x86_64, UEFI)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf b/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
index d66f5a6b..7a26cbab 100644
--- a/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
+++ b/setup/linux/profile_base/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf
@@ -1,4 +1,6 @@
 title   Arch Linux (x86_64, UEFI) Copy to RAM
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
diff --git a/setup/linux/profile_base/profiledef.sh b/setup/linux/profile_base/profiledef.sh
index 557ca943..2047e0ee 100644
--- a/setup/linux/profile_base/profiledef.sh
+++ b/setup/linux/profile_base/profiledef.sh
@@ -11,10 +11,12 @@ buildmodes=('iso')
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
+airootfs_image_type="squashfs"
+airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
-  ["/etc/shadow"]="0:0:0400"
-  ["/etc/gshadow"]="0:0:0400"
-  ["/etc/skel/.ssh"]="0:0:0700"
-  ["/etc/skel/.ssh/authorized_keys"]="0:0:0600"
-  ["/etc/skel/.ssh/id_rsa"]="0:0:0600"
+  ["/etc/shadow"]="0:0:400"
+  ["/etc/gshadow"]="0:0:400"
+  ["/etc/skel/.ssh"]="0:0:700"
+  ["/etc/skel/.ssh/authorized_keys"]="0:0:600"
+  ["/etc/skel/.ssh/id_rsa"]="0:0:600"
 )