From 3fd1950b9ebdf1d486a07c459245121bf0cdc5fa Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 8 Sep 2024 10:44:42 +0200 Subject: [PATCH] reorder configs, make TRIGGERS an array --- etc/archboot/aarch64-init.conf | 8 ++- etc/archboot/aarch64-latest.conf | 15 +++++- etc/archboot/aarch64-local.conf | 13 ++++- etc/archboot/aarch64-update_installer.conf | 58 +++++++++++++++++++--- etc/archboot/aarch64.conf | 49 +++++++++++++++--- etc/archboot/riscv64-init.conf | 8 ++- etc/archboot/riscv64.conf | 45 ++++++++++++++--- etc/archboot/server-update.conf | 54 +++++++++++++++++--- etc/archboot/x86_64-init.conf | 8 ++- etc/archboot/x86_64-latest.conf | 15 +++++- etc/archboot/x86_64-local.conf | 13 ++++- etc/archboot/x86_64-update_installer.conf | 58 +++++++++++++++++++--- etc/archboot/x86_64.conf | 49 +++++++++++++++--- usr/bin/archboot-server-update.sh | 2 +- 14 files changed, 340 insertions(+), 55 deletions(-) diff --git a/etc/archboot/aarch64-init.conf b/etc/archboot/aarch64-init.conf index 988296e1d..d18faf19f 100644 --- a/etc/archboot/aarch64-init.conf +++ b/etc/archboot/aarch64-init.conf @@ -1,4 +1,10 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/aarch64-latest.conf b/etc/archboot/aarch64-latest.conf index 9adae3a71..e72fd66fd 100644 --- a/etc/archboot/aarch64-latest.conf +++ b/etc/archboot/aarch64-latest.conf @@ -1,5 +1,16 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/aarch64-local.conf b/etc/archboot/aarch64-local.conf index 6359928b2..54ae2786d 100644 --- a/etc/archboot/aarch64-local.conf +++ b/etc/archboot/aarch64-local.conf @@ -1,5 +1,14 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index 9c2bfbc27..0f7146784 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -1,11 +1,53 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index 5628c6d4f..2abe719a5 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -1,10 +1,45 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/riscv64-init.conf b/etc/archboot/riscv64-init.conf index c7ac67513..ec0f95835 100644 --- a/etc/archboot/riscv64-init.conf +++ b/etc/archboot/riscv64-init.conf @@ -1,4 +1,10 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index c1cc9b260..5aa9cc8c7 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -1,9 +1,42 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/server-update.conf b/etc/archboot/server-update.conf index a5e61512c..acd9a3d95 100644 --- a/etc/archboot/server-update.conf +++ b/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 +) diff --git a/etc/archboot/x86_64-init.conf b/etc/archboot/x86_64-init.conf index c7ac67513..ec0f95835 100644 --- a/etc/archboot/x86_64-init.conf +++ b/etc/archboot/x86_64-init.conf @@ -1,4 +1,10 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/x86_64-latest.conf b/etc/archboot/x86_64-latest.conf index 02ef48364..bfc1b9e0d 100644 --- a/etc/archboot/x86_64-latest.conf +++ b/etc/archboot/x86_64-latest.conf @@ -1,5 +1,16 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/x86_64-local.conf b/etc/archboot/x86_64-local.conf index 34923f35a..9718c7ccd 100644 --- a/etc/archboot/x86_64-local.conf +++ b/etc/archboot/x86_64-local.conf @@ -1,5 +1,14 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index ea130cace..dc0340dfc 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -1,11 +1,53 @@ # Created by Tobias Powalowski # 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 +) diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index e6af36421..8c02eb0c7 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -1,10 +1,45 @@ # Created by Tobias Powalowski # 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 +) diff --git a/usr/bin/archboot-server-update.sh b/usr/bin/archboot-server-update.sh index 645e97e3f..994ed8b8f 100755 --- a/usr/bin/archboot-server-update.sh +++ b/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