From 26d578bc1a233989519e7ab4d36dfc476f04755d Mon Sep 17 00:00:00 2001
From: Tyler McGurrin <mcgurrintyler@gmail.com>
Date: Tue, 4 Nov 2025 23:23:42 -0500
Subject: [PATCH] Unfuck this nightmare (no longer adds a user, for... security
 reasons)

---
 makeiso.sh         | 18 +++++++-----------
 mini/packages.i686 |  4 ++--
 mini/pacman.conf   | 26 +++-----------------------
 mini/profiledef.sh |  6 ++----
 4 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/makeiso.sh b/makeiso.sh
index 75c9e5f..742abdb 100755
--- a/makeiso.sh
+++ b/makeiso.sh
@@ -1,22 +1,18 @@
 echo Installing Dependancies
 
-sudo pacman -Sy --noconfirm python3 python-pytest pkgconf git sequoia-sq archiso micro grub base-devel chpasswd
+sudo pacman -Sy --noconfirm --needed python3 python-pytest pkgconf git sequoia-sq archiso micro grub base-devel memtest86+
 
 echo Adding Keys
 
+rm -rf archlinux32-keyring
 git clone https://aur.archlinux.org/archlinux32-keyring.git
 cd archlinux32-keyring
-sudo useradd build -G wheel,storage
-echo build:build | chpasswd
-echo Build User Passwd is: build
-sudo chown -R build ./
-echo build
-su build -c 'makepkg -so --skippgpcheck --noconfirm'
+makepkg -si --skippgpcheck --noconfirm
 cd ..
-sudo mv ./archlinux32-keyring/src/archlinux32-keyring-v20240131/archlinux32.pgp ./archlinux32-keyring/src/archlinux32-keyring-v20240131/pubring.pgp
-sudo pacman-key --import ./archlinux32-keyring/src/archlinux32-keyring-v20240131/pubring.pgp
-sudo pacman-key --init
-sudo pacman-key --populate
+#sudo mv ./archlinux32-keyring/src/archlinux32-keyring-*/archlinux32.pgp ./archlinux32-keyring/pubring.pgp
+#sudo pacman-key --import ./archlinux32-keyring/pubring.pgp
+#sudo pacman-key --init
+#sudo pacman-key --populate
 
 
 echo Making ISO...
diff --git a/mini/packages.i686 b/mini/packages.i686
index 2c82d8e..877e7ef 100644
--- a/mini/packages.i686
+++ b/mini/packages.i686
@@ -1,9 +1,9 @@
 base
-linux
+linux-lts
 mkinitcpio
 mkinitcpio-archiso
 syslinux
-nano
+vim
 arch-install-scripts
 pcmciautils
 net-tools
diff --git a/mini/pacman.conf b/mini/pacman.conf
index 15a1602..80fac7c 100644
--- a/mini/pacman.conf
+++ b/mini/pacman.conf
@@ -30,12 +30,13 @@ Architecture = i686
 
 # Misc options
 #UseSyslog
-#Color
+Color
 #NoProgressBar
 # We cannot check disk space from within a chroot environment
 #CheckSpace
 #VerbosePkgLists
-ParallelDownloads = 5
+ParallelDownloads = 1
+ILoveCandy
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -70,29 +71,8 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [core]
 Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo
 
-#[extra-testing]
-#Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Server = http://mirror.clarkson.edu/archlinux32/$arch/$repo
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
diff --git a/mini/profiledef.sh b/mini/profiledef.sh
index 3f85f51..9e4e719 100644
--- a/mini/profiledef.sh
+++ b/mini/profiledef.sh
@@ -1,16 +1,14 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034
 
-iso_name="archlinux-baseline"
+iso_name="archlinux32-mini"
 iso_label="ARCH_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)"
 iso_publisher="Arch Linux <https://archlinux.org>"
 iso_application="Arch Linux baseline"
 iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
-bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
-           'uefi-ia32.grub.esp'
-           'uefi-ia32.grub.eltorito')
+bootmodes=('bios.syslinux.mbr')
 arch="i686"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"