update CHANGELOG

CHANGELOG

@@ -4,6 +4,8 @@ On the road to 2024.09:
 - added archboot-x86_64-uki.sh script
 - added archboot-aarch64-uki.sh script
 - switched name scheme for UKI images
+- switched TRIGGERS to an array
+- reordered config arrays
 setup:
 - switched to new limine 8.0 config layout (issue #4)
 - switched to mkinitcpio uki generation (issue #3)

etc/archboot/aarch64-init.conf

@@ -1,4 +1,10 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/boot/Image.gz"
-_HOOKS=(base_common base_common_mods base_init base_init_mods block_mods)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_init
+  base_init_mods
+  block_mods
+)

etc/archboot/aarch64-latest.conf

@@ -1,5 +1,16 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/boot/Image.gz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-         kexec kms_mods installer_common licenses net_common net_mods remote)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  kexec
+  kms_mods
+  installer_common
+  licenses
+  net_common
+  net_mods
+  remote
+)

etc/archboot/aarch64-local.conf

@@ -1,5 +1,14 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/boot/Image.gz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-        cache installer_common kexec kms_mods licenses)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  cache
+  installer_common
+  kexec
+  kms_mods
+  licenses
+)

etc/archboot/aarch64-update_installer.conf

@@ -1,11 +1,53 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/boot/Image.gz"
-_HOOKS=(cache cache_cleanup firmware firmware_mods firmware_cleanup base_common_mods
-        block_mods kms_mods filesystems_mods cpufreq_mods devicemapper_mods
-        hypervisor_mods net_mods wireless_mods mdadm_mods base_common_system_mods
-        mods_cleanup base_common base_common_cleanup base_common_system
-        base_common_system_cleanup base_system base_system_cleanup clock cpufreq
-        devicemapper efi filesystems filesystems_cleanup installer_common installer
-        kexec licenses lshw lvm2 mdadm motd neovim net net_cleanup net_common pciutils
-        remote secureboot smartmontools usbutils vconsole wireless)
+_HOOKS=(
+  cache
+  cache_cleanup
+  firmware
+  firmware_mods
+  firmware_cleanup
+  base_common_mods
+  base_common_system_mods
+  block_mods
+  cpufreq_mods
+  devicemapper_mods
+  filesystems_mods
+  hypervisor_mods
+  kms_mods
+  mdadm_mods
+  net_mods
+  wireless_mods
+  mods_cleanup
+  base_common
+  base_common_cleanup
+  base_common_system
+  base_common_system_cleanup
+  base_system
+  base_system_cleanup
+  clock
+  cpufreq
+  devicemapper
+  efi
+  filesystems
+  filesystems_cleanup
+  installer_common
+  installer
+  kexec
+  licenses
+  lshw
+  lvm2
+  mdadm
+  motd
+  neovim
+  net
+  net_cleanup
+  net_common
+  pciutils
+  remote
+  secureboot
+  smartmontools
+  usbutils
+  vconsole
+  wireless
+)

etc/archboot/aarch64.conf

@@ -1,10 +1,45 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/boot/Image.gz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-        base_system block_mods clock cpufreq cpufreq_mods devicemapper
-        devicemapper_mods dmidecode efi filesystems filesystems_mods firmware
-        firmware_mods hypervisor_mods installer_common installer kexec kms_mods
-        licenses lshw lvm2 mdadm mdadm_mods motd neovim net_common net net_mods
-        pciutils remote secureboot smartmontools usbutils vconsole wireless
-        wireless_mods)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  base_system
+  block_mods
+  clock
+  cpufreq
+  cpufreq_mods
+  devicemapper
+  devicemapper_mods
+  dmidecode
+  efi
+  filesystems
+  filesystems_mods
+  firmware
+  firmware_mods
+  hypervisor_mods
+  installer_common
+  installer
+  kexec
+  kms_mods
+  licenses
+  lshw
+  lvm2
+  mdadm
+  mdadm_mods
+  motd
+  neovim
+  net_common
+  net
+  net_mods
+  pciutils
+  remote
+  secureboot
+  smartmontools
+  usbutils
+  vconsole
+  wireless
+  wireless_mods
+)

etc/archboot/riscv64-init.conf

@@ -1,4 +1,10 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(base_common base_common_mods base_init base_init_mods block_mods)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_init
+  base_init_mods
+  block_mods
+)

etc/archboot/riscv64.conf

@@ -1,9 +1,42 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-        base_system block_mods clock devicemapper devicemapper_mods efi
-        filesystems filesystems_mods firmware firmware_mods hypervisor_mods
-        installer_common installer kexec kms_mods licenses lshw lvm2 mdadm
-        mdadm_mods motd neovim net_common net net_mods pciutils remote
-        secureboot smartmontools usbutils vconsole wireless wireless_mods)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  base_system
+  block_mods
+  clock
+  devicemapper
+  devicemapper_mods
+  efi
+  filesystems
+  filesystems_mods
+  firmware
+  firmware_mods
+  hypervisor_mods
+  installer_common
+  installer
+  kexec
+  kms_mods
+  licenses
+  lshw
+  lvm2
+  mdadm
+  mdadm_mods
+  motd
+  neovim
+  net_common
+  net
+  net_mods
+  pciutils
+  remote
+  secureboot
+  smartmontools
+  usbutils
+  vconsole
+  wireless
+  wireless_mods
+)

etc/archboot/server-update.conf

@@ -5,10 +5,50 @@ _SERVER_ARCH="x86_64 aarch64 riscv64"
 # set your time before next architecture is built (value in seconds)
 _SERVER_WAIT="3600"
 # set program updates that trigger new server release
-_TRIGGER="3cpio arch-install-scripts archboot archboot-arm archboot-bootloader
-          archboot-riscv archlinux-keyring archlinuxarm-keyring bash 
-          bcachefs-tools btrfs-progs ca-certificates coreutils cryptsetup curl
-          device-mapper dosfstools e2fsprogs glibc hwdetect intel-ucode iproute2
-          iputils iw iwd kbd kmod linux linux-firmware lvm2 mdadm mkinitcpio
-          nano neovim openssh openssl pacman pam systemd thin-provisioning-tools
-          ttyd tzdata util-linux wireless-regdb xfsprogs"
+_TRIGGER=(
+  3cpio
+  arch-install-scripts
+  archboot
+  archboot-arm
+  archboot-bootloader
+  archboot-riscv
+  archlinux-keyring
+  archlinuxarm-keyring
+  bash 
+  bcachefs-tools
+  btrfs-progs
+  ca-certificates
+  coreutils
+  cryptsetup
+  curl
+  device-mapper
+  dosfstools
+  e2fsprogs
+  glibc
+  hwdetect
+  intel-ucode
+  iproute2
+  iputils
+  iw
+  iwd
+  kbd
+  kmod
+  linux
+  linux-firmware
+  lvm2
+  mdadm
+  mkinitcpio
+  nano
+  neovim
+  openssh
+  openssl
+  pacman
+  pam
+  systemd
+  thin-provisioning-tools
+  ttyd
+  tzdata
+  util-linux
+  wireless-regdb
+  xfsprogs
+)

etc/archboot/x86_64-init.conf

@@ -1,4 +1,10 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(base_common base_common_mods base_init base_init_mods block_mods)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_init
+  base_init_mods
+  block_mods
+)

etc/archboot/x86_64-latest.conf

@@ -1,5 +1,16 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-         kexec kms_mods installer_common licenses net_common net_mods remote)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  kexec
+  kms_mods
+  installer_common
+  licenses
+  net_common
+  net_mods
+  remote
+)

etc/archboot/x86_64-local.conf

@@ -1,5 +1,14 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-        cache installer_common kexec kms_mods licenses)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  cache
+  installer_common
+  kexec
+  kms_mods
+  licenses
+)

etc/archboot/x86_64-update_installer.conf

@@ -1,11 +1,53 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(cache cache_cleanup firmware firmware_mods firmware_cleanup base_common_mods
-        block_mods kms_mods filesystems_mods cpufreq_mods devicemapper_mods
-        hypervisor_mods net_mods wireless_mods mdadm_mods base_common_system_mods
-        mods_cleanup base_common base_common_cleanup base_common_system
-        base_common_system_cleanup base_system base_system_cleanup clock cpufreq
-        devicemapper efi filesystems filesystems_cleanup installer_common installer
-        kexec licenses lshw lvm2 mdadm motd neovim net net_cleanup net_common pciutils
-        remote secureboot smartmontools usbutils vconsole wireless)
+_HOOKS=(
+  cache
+  cache_cleanup
+  firmware
+  firmware_mods
+  firmware_cleanup
+  base_common_mods
+  base_common_system_mods
+  block_mods
+  cpufreq_mods
+  devicemapper_mods
+  filesystems_mods
+  hypervisor_mods
+  kms_mods
+  mdadm_mods
+  net_mods
+  wireless_mods
+  mods_cleanup
+  base_common
+  base_common_cleanup
+  base_common_system
+  base_common_system_cleanup
+  base_system
+  base_system_cleanup
+  clock
+  cpufreq
+  devicemapper
+  efi
+  filesystems
+  filesystems_cleanup
+  installer_common
+  installer
+  kexec
+  licenses
+  lshw
+  lvm2
+  mdadm
+  motd
+  neovim
+  net
+  net_cleanup
+  net_common
+  pciutils
+  remote
+  secureboot
+  smartmontools
+  usbutils
+  vconsole
+  wireless
+)

etc/archboot/x86_64.conf

@@ -1,10 +1,45 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
 # SPDX-License-Identifier: GPL-3.0-or-later
 _KERNEL="/usr/lib/modules/*/vmlinuz"
-_HOOKS=(base_common base_common_mods base_common_system base_common_system_mods
-        base_system block_mods clock cpufreq cpufreq_mods devicemapper
-        devicemapper_mods dmidecode efi filesystems filesystems_mods firmware
-        firmware_mods hypervisor_mods installer_common installer kexec kms_mods
-        licenses lshw lvm2 mdadm mdadm_mods motd neovim net_common net net_mods
-        pciutils remote secureboot smartmontools usbutils vconsole wireless
-        wireless_mods)
+_HOOKS=(
+  base_common
+  base_common_mods
+  base_common_system
+  base_common_system_mods
+  base_system
+  block_mods
+  clock
+  cpufreq
+  cpufreq_mods
+  devicemapper
+  devicemapper_mods
+  dmidecode
+  efi
+  filesystems
+  filesystems_mods
+  firmware
+  firmware_mods
+  hypervisor_mods
+  installer_common
+  installer
+  kexec
+  kms_mods
+  licenses
+  lshw
+  lvm2
+  mdadm
+  mdadm_mods
+  motd
+  neovim
+  net_common
+  net
+  net_mods
+  pciutils
+  remote
+  secureboot
+  smartmontools
+  usbutils
+  vconsole
+  wireless
+  wireless_mods
+)

usr/bin/archboot-server-update.sh

@@ -30,7 +30,7 @@ for i in ${_SERVER_ARCH}; do
     # update container to latest packages
     systemd-nspawn -q -D "${i}" pacman --noconfirm -Syu
     rg -o 'upgraded (.*) \(' -r '$1' "${i}"/var/log/pacman.log > upgrade-"${i}".log
-    for k in ${_TRIGGER}; do
+    for k in ${_TRIGGER[@]}; do
         # if trigger successful, release new image to server
         if rg -qw "${k}" upgrade-"${i}".log; then
             archboot-"${i}"-server-release.sh run || echo "Error: ${i} release!" >> error.log

usr/lib/archboot/release.sh

@@ -126,13 +126,13 @@ _create_iso() {
         rm -r "${_W_DIR:?}"/boot
         mv boot "${_W_DIR}"
         for initrd in ${_INITRD} ${_INITRD_LATEST} ${_INITRD_LOCAL}; do
-            [[ "${initrd}" == "${_INITRD}" ]] && _UKI="/boot/${_NAME}-${_ARCH}.efi"
-            [[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="/boot/${_NAME}-latest-${_ARCH}.efi"
-            [[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="/boot/${_NAME}-local-${_ARCH}.efi"
+            [[ "${initrd}" == "${_INITRD}" ]] && _UKI="/boot/${_NAME}-${_ARCH}"
+            [[ "${initrd}" == "${_INITRD_LATEST}" ]] && _UKI="/boot/${_NAME}-latest-${_ARCH}"
+            [[ "${initrd}" == "${_INITRD_LOCAL}" ]] && _UKI="/boot/${_NAME}-local-${_ARCH}"
             #shellcheck disable=SC2086
             ${_NSPAWN} "${_W_DIR}" /usr/lib/systemd/ukify build --linux="${_KERNEL}" \
                 ${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${initrd}" --cmdline="${_CMDLINE}" \
-                --os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}" &>"${_NO_LOG}" || exit 1
+                --os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}.efi" &>"${_NO_LOG}" || exit 1
         done
         # fix permission and timestamp
         mv "${_W_DIR}"/boot ./

usr/lib/archboot/uki.sh

@@ -44,7 +44,7 @@ _config() {
     # aarch64 .gz kernel is not supported!
     _KERNEL="$(echo ${_KERNEL} | sd '\.gz' '')"
     #shellcheck disable=SC2154
-    [[ -z "${_UKI}" ]] && _UKI="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver "${_KERNEL}")-${_ARCH}".efi
+    [[ -z "${_UKI}" ]] && _UKI="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver "${_KERNEL}")-${_ARCH}"
 }
 
 _prepare_initramfs() {
@@ -64,7 +64,7 @@ _systemd_ukify() {
     #shellcheck disable=SC2086
     /usr/lib/systemd/ukify build --linux="${_KERNEL}" \
         ${_INTEL_UCODE} ${_AMD_UCODE} --initrd="${_INITRD}" --cmdline="${_CMDLINE}" \
-        --os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}" &>"${_NO_LOG}" || exit 1
+        --os-release=@"${_OSREL}" --splash="${_SPLASH}" --output="${_UKI}.efi" &>"${_NO_LOG}" || exit 1
 }
 
 _create_cksum() {

usr/share/archboot/doc/archboot.html

@@ -17,7 +17,7 @@
 <h1>Archboot Home | <a href="https://archboot.com/gallery.html">Gallery</a> | <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=Z7GXKW4MKHK7C"><img src="donate.png" alt="Donate"></a></h1>
 <h2>2024 Fundraise: 0% <progress max="100" value="48">0%</progress> 100%</h2>
 <p><strong>&copy; 2006 - 2024 | <a href=mailto:tpowa@archlinux.org>Tobias Powalowski</a></strong> | Arch Linux Developer <strong><a href="https://archlinux.org/people/developers/#tpowa">tpowa</a></strong><br>
-<strong>Last update: 06.09.2024 09:37</strong></p>
+<strong>Last update: 08.09.2024 10:23</strong></p>
 <nav id="TOC" role="doc-toc">
 <ul>
 <li><a href="#introduction" id="toc-introduction"><strong><span class="toc-section-number">1.</span> Introduction</strong></a></li>
@@ -1205,7 +1205,7 @@ Functions supported in <strong>/usr/lib/archboot/cpio/hooks/&lt;hook&gt;</strong
 </tbody>
 </table>
 <h4 data-number="7.2.3.4" id="archboot-x86_64-iso.sh"><span class="header-section-number">7.2.3.4</span> <strong>archboot-x86_64-iso.sh</strong></h4>
-<p>Script for image creation from running system or for use in Archboot container.</p>
+<p>Script for ISO creation from running system or for use in Archboot container.</p>
 <table>
 <thead>
 <tr class="header">