Update iso build to follow upstream

netinstall-iso/airootfs/etc/hostname

@@ -1 +1 @@
-blackarch
+blackarchiso

netinstall-iso/airootfs/etc/locale.conf

@@ -1 +1 @@
-LANG=en_US.UTF-8
+LANG=C.UTF-8

netinstall-iso/airootfs/etc/mkinitcpio.conf.d/archiso.conf

@@ -0,0 +1,3 @@
+HOOKS=(base udev microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
+COMPRESSION="xz"
+COMPRESSION_OPTIONS=(-9e)

netinstall-iso/airootfs/etc/mkinitcpio.d/linux.preset

@@ -1,11 +1,8 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
 # mkinitcpio preset file for the 'linux' package on archiso
 
 PRESETS=('archiso')
 
 ALL_kver='/boot/vmlinuz-linux'
-ALL_config='/etc/mkinitcpio.conf'
+archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
 
 archiso_image="/boot/initramfs-linux.img"

netinstall-iso/airootfs/etc/modprobe.d/broadcom-wl.conf

@@ -0,0 +1,7 @@
+# The broadcom-wl package requires some modules to be disabled in order to use
+# wl. Since the ISO image needs to cover many hardware cases, this file
+# overrides the default blacklist in /usr/lib/modprobe.d/
+#
+# If you need to use wl, you may need to delete this file, then `rmmod` any
+# already-loaded modules that are now blacklisted before proceeding to modprobe
+# wl itself.

netinstall-iso/airootfs/etc/motd

@@ -0,0 +1,11 @@
+To install Arch Linux follow the installation guide:
+https://wiki.archlinux.org/title/Installation_guide
+
+For Wi-Fi, authenticate to the wireless network using the iwctl utility.
+For mobile broadband (WWAN) modems, connect with the mmcli utility.
+Ethernet, WLAN and WWAN interfaces using DHCP should work automatically.
+
+After connecting to the internet, the installation guide can be accessed
+via the convenience script Installation_guide.
+
+                                          

netinstall-iso/airootfs/etc/os-release

@@ -1,8 +1,9 @@
-NAME="BlackArch Linux"
+NAME="BlackArch"
 ID=blackarch
+ID_LIKE=arch
 PRETTY_NAME="BlackArch Linux"
-ANSI_COLOR="0;34"
-HOME_URL="https://www.blackarch.org/"
-SUPPORT_URL="https://www.blackarch.org/"
-BUG_REPORT_URL="https://www.blackarch.org/"
-
+ANSI_COLOR="38;2;23;147;209"
+HOME_URL="https://blackarch.org/"
+SUPPORT_URL="https://blackarch.org/community.html"
+BUG_REPORT_URL="https://github.com/BlackArch/blackarch/issues"
+LOGO=blackarch

netinstall-iso/airootfs/etc/pacman.conf

@@ -32,9 +32,11 @@ Architecture = auto
 #UseSyslog
 Color
 #NoProgressBar
-#CheckSpace
+CheckSpace
 #VerbosePkgLists
 ParallelDownloads = 5
+DownloadUser = alpm
+#DisableSandbox
 
 # 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.
@@ -69,19 +71,16 @@ 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.
 
-#[testing]
+#[core-testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
+#[extra-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
@@ -99,3 +98,5 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
+[blackarch]
+Include = /etc/pacman.d/blackarch-mirrorlist

netinstall-iso/airootfs/etc/pacman.d/blackarch-mirrorlist

@@ -1,50 +1,50 @@
-# Worldwide
-#Server = https://mirrors.fosshost.org/blackarch/$repo/os/$arch
-#Server = https://mirrors.fossho.st/blackarch/$repo/os/$arch
-
 # Australia
+#Server = http://au.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://au.mirrors.cicku.me/blackarch/$repo/os/$arch
 #Server = http://blackarch.mirror.digitalpacific.com.au/$repo/os/$arch
 
 # Austria
 #Server = http://mirror.easyname.at/blackarch/$repo/os/$arch
 #Server = ftp://mirror.easyname.at/blackarch/$repo/os/$arch
 
+# Canada
+#Server = http://ca.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://ca.mirrors.cicku.me/blackarch/$repo/os/$arch
+
 # China
+#Server = https://mirrors.hust.edu.cn/blackarch/$repo/os/$arch
 #Server = https://mirror.sjtu.edu.cn/blackarch/$repo/os/$arch
+#Server = https://mirrors.nju.edu.cn/blackarch/$repo/os/$arch
+#Server = http://mirrors.nju.edu.cn/blackarch/$repo/os/$arch
 #Server = https://mirrors.tuna.tsinghua.edu.cn/blackarch/$repo/os/$arch
 #Server = https://mirrors.ustc.edu.cn/blackarch/$repo/os/$arch
+#Server = http://mirrors.aliyun.com/blackarch/$repo/os/$arch
+#Server = https://mirrors.aliyun.com/blackarch/$repo/os/$arch
 
 # Denmark
 #Server = https://mirrors.dotsrc.org/blackarch/$repo/os/$arch
 #Server = http://mirrors.dotsrc.org/blackarch/$repo/os/$arch
 #Server = ftp://mirrors.dotsrc.org/blackarch/$repo/os/$arch
 
 # Ecuador
-#Server = http://mirror.uta.edu.ec/blackarch/$repo/os/$arch
-#Server = https://mirror.uta.edu.ec/blackarch/$repo/os/$arch
-#Server = ftp://mirror.uta.edu.ec/blackarch/$repo/os/$arch
 #Server = http://mirror.cedia.org.ec/blackarch/$repo/os/$arch
 #Server = https://mirror.cedia.org.ec/blackarch/$repo/os/$arch
 
 # France
-#Server = https://www.blackarch.org/blackarch/$repo/os/$arch
-#Server = http://www.blackarch.org/blackarch/$repo/os/$arch
-#Server = http://blackarch.tamcore.eu/blackarch/$repo/os/$arch
-#Server = https://blackarch.tamcore.eu/blackarch/$repo/os/$arch
 #Server = http://blackarch.leneveu.fr/blackarch/$repo/os/$arch
-#Server = http://blackarch.pi3rrot.net/blackarch/$repo/os/$arch
 #Server = http://mirror.cyberbits.eu/blackarch/$repo/os/$arch
 #Server = https://mirror.cyberbits.eu/blackarch/$repo/os/$arch
 
 # Germany
-#Server = https://mirrors.dr460nf1r3.me/repos/blackarch/$repo/os/$arch
+Server = https://www.blackarch.org/blackarch/$repo/os/$arch
+#Server = http://www.blackarch.org/blackarch/$repo/os/$arch
+#Server = http://de.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://de.mirrors.cicku.me/blackarch/$repo/os/$arch
 #Server = http://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
-Server = https://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
+#Server = https://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
 #Server = ftp://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
 #Server = http://blackarch.unixpeople.org/$repo/os/$arch
 #Server = https://blackarch.unixpeople.org/$repo/os/$arch
-#Server = http://mirror.undisclose.de/blackarch/$repo/os/$arch
-#Server = https://mirror.undisclose.de/blackarch/$repo/os/$arch
 
 # Greece
 #Server = http://ftp.cc.uoc.gr/mirrors/linux/blackarch/$repo/os/$arch
@@ -53,6 +53,13 @@ Server = https://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
 # Great Britain
 #Server = http://www.mirrorservice.org/sites/blackarch.org/blackarch/$repo/os/$arch
 #Server = https://www.mirrorservice.org/sites/blackarch.org/blackarch/$repo/os/$arch
+#Server = http://mirrors.gethosted.online/blackarch/blackarch/$repo/os/$arch
+#Server = https://mirrors.gethosted.online/blackarch/blackarch/$repo/os/$arch
+
+# India
+#Server = http://in.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://in.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://mirror.maa.albony.in/blackarch/$repo/os/$arch
 
 # Iran
 #Server = http://mirror.blackrepo.com/$repo/os/$arch
@@ -61,36 +68,45 @@ Server = https://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
 #Server = http://blackarch.mirror.garr.it/mirrors/blackarch/$repo/os/$arch
 
 # Japan
+#Server = http://jp.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://jp.mirrors.cicku.me/blackarch/$repo/os/$arch
 #Server = http://www.ftp.ne.jp/Linux/packages/blackarch/$repo/os/$arch
 #Server = https://www.ftp.ne.jp/Linux/packages/blackarch/$repo/os/$arch
 #Server = http://ftp.kddilabs.jp/Linux/packages/blackarch/$repo/os/$arch
 #Server = https://ftp.kddilabs.jp/Linux/packages/blackarch/$repo/os/$arch
 
+# Korea
+#Server = https://deny.krfoss.org/blackarch/$repo/os/$arch
+#Server = http://kr.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://kr.mirrors.cicku.me/blackarch/$repo/os/$arch
+
 # Netherlands
 #Server = http://mirror.serverion.com/blackarch/$repo/os/$arch
 #Server = https://mirror.serverion.com/blackarch/$repo/os/$arch
-#Server = http://mirror.neostrada.nl/blackarch/$repo/os/$arch
-#Server = https://mirror.neostrada.nl/blackarch/$repo/os/$arch
-#Server = ftp://mirror.neostrada.nl/blackarch/$repo/os/$arch
-
-# New Zealand
-#Server = http://nz-mirror.intergrid.com.au/blackarch/$repo/os/$arch
 
 # Poland
 #Server = http://ftp.icm.edu.pl/pub/Linux/dist/blackarch/$repo/os/$arch
 #Server = https://ftp.icm.edu.pl/pub/Linux/dist/blackarch/$repo/os/$arch
 #Server = ftp://ftp.icm.edu.pl/pub/Linux/dist/blackarch/$repo/os/$arch
 #Server = gopher://ftp.icm.edu.pl/1/pub/Linux/dist/blackarch/$repo/os/$arch
 
+# Portugal
+#Server = http://eu.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://eu.mirrors.cicku.me/blackarch/$repo/os/$arch
+
+# Romania
+#Server = http://mirrors.hostico.ro/blackarch/$repo/os/$arch
+#Server = https://mirrors.hostico.ro/blackarch/$repo/os/$arch
+
 # Russia
-#Server = http://mirror.surf/blackarch/$repo/os/$arch
-#Server = https://mirror.surf/blackarch/$repo/os/$arch
-#Server = http://mirror.truenetwork.ru/blackarch/$repo/os/$arch
-#Server = ftp://mirror.truenetwork.ru/blackarch/$repo/os/$arch
+#Server = http://repository.su/blackarch/$repo/os/$arch
+#Server = https://repository.su/blackarch/$repo/os/$arch
 #Server = http://mirror.yandex.ru/mirrors/blackarch/$repo/os/$arch
 #Server = ftp://mirror.yandex.ru/mirrors/blackarch/$repo/os/$arch
 
 # Singapore
+#Server = http://sg.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://sg.mirrors.cicku.me/blackarch/$repo/os/$arch
 #Server = http://download.nus.edu.sg/mirror/blackarch/$repo/os/$arch
 #Server = https://download.nus.edu.sg/mirror/blackarch/$repo/os/$arch
 
@@ -112,15 +128,27 @@ Server = https://ftp.halifax.rwth-aachen.de/blackarch/$repo/os/$arch
 #Server = ftp://ftp.linux.org.tr/blackarch/$repo/os/$arch
 
 # Taiwan
-#Server = http://blackarch.cs.nctu.edu.tw/$repo/os/$arch
-
-# USA
-#Server = http://blackarch.pr0s3c.nl/blackarch/$repo/os/$arch
-#Server = https://blackarch.pr0s3c.nl/blackarch/$repo/os/$arch
+#Server = http://blackarch.cs.nycu.edu.tw/$repo/os/$arch
+#Server = https://blackarch.cs.nycu.edu.tw/$repo/os/$arch
+#Server = http://mirror.archlinux.tw/BlackArch/$repo/os/$arch
+#Server = https://mirror.archlinux.tw/BlackArch/$repo/os/$arch
+
+# UK
+#Server = http://mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = http://mirrors.gethosted.online/blackarch/blackarch/$repo/os/$arch
+#Server = https://mirrors.gethosted.online/blackarch/blackarch/$repo/os/$arch
+
+# US
+#Server = http://us.mirrors.cicku.me/blackarch/$repo/os/$arch
+#Server = https://us.mirrors.cicku.me/blackarch/$repo/os/$arch
 #Server = http://mirror.math.princeton.edu/pub/blackarch/$repo/os/$arch
 #Server = http://distro.ibiblio.org/blackarch/$repo/os/$arch
 #Server = ftp://distro.ibiblio.org/blackarch/$repo/os/$arch
-#Server = https://deadbeef.ninja/blackarch/$repo/os/$arch
-#Server = http://mirror.team-cymru.com/blackarch/$repo/os/$arch
+#Server = https://mirror.team-cymru.com/blackarch/$repo/os/$arch
 #Server = ftp://mirror.team-cymru.com/blackarch/$repo/os/$arch
+#Server = https://mirrors.ocf.berkeley.edu/blackarch/$repo/os/$arch
+#Server = http://mirrors.ocf.berkeley.edu/blackarch/$repo/os/$arch
+#Server = https://ftp2.osuosl.org/pub/blackarch/$repo/os/$arch
+#Server = http://ftp2.osuosl.org/pub/blackarch/$repo/os/$arch
 

netinstall-iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook

@@ -0,0 +1,13 @@
+# remove from airootfs!
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Type = Package
+Target = pacman-mirrorlist
+
+[Action]
+Description = Uncommenting all mirrors in /etc/pacman.d/mirrorlist...
+When = PostTransaction
+Depends = pacman-mirrorlist
+Depends = sed
+Exec = /usr/bin/sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist

netinstall-iso/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook

@@ -0,0 +1,18 @@
+# remove from airootfs!
+# As a workaround for https://bugs.archlinux.org/task/49347 , remove pacman hooks specific to the ISO build process.
+# If not, they would be used when pacstrap is run in the live environment.
+
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Type = Package
+Target = *
+
+[Action]
+Description = Work around FS#49347 by removing custom pacman hooks that are only required during ISO build...
+When = PostTransaction
+Depends = sh
+Depends = coreutils
+Depends = grep
+Exec = /bin/sh -c "rm -- $(grep -Frl 'remove from airootfs' /etc/pacman.d/hooks/)"