From f16836af8b5b3ccce3e3a4a13d2b3ddcc51ba00e Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 12 Oct 2023 09:44:12 +0200 Subject: [PATCH] rename build to _run --- usr/lib/archboot/cpio/acpi | 2 +- usr/lib/archboot/cpio/base | 2 +- usr/lib/archboot/cpio/base_cleanup | 2 +- usr/lib/archboot/cpio/base_common | 2 +- usr/lib/archboot/cpio/base_common_cleanup | 2 +- usr/lib/archboot/cpio/base_latest | 2 +- usr/lib/archboot/cpio/block_modules | 2 +- usr/lib/archboot/cpio/cache | 2 +- usr/lib/archboot/cpio/cache_cleanup | 2 +- usr/lib/archboot/cpio/clock | 2 +- usr/lib/archboot/cpio/common_modules | 2 +- usr/lib/archboot/cpio/cpio.sh | 48 +++++++++++------------ usr/lib/archboot/cpio/cpufreq | 2 +- usr/lib/archboot/cpio/devicemapper | 2 +- usr/lib/archboot/cpio/dmidecode | 2 +- usr/lib/archboot/cpio/efibootmgr | 2 +- usr/lib/archboot/cpio/efivar | 2 +- usr/lib/archboot/cpio/filesystems | 2 +- usr/lib/archboot/cpio/filesystems_cleanup | 2 +- usr/lib/archboot/cpio/firmware | 2 +- usr/lib/archboot/cpio/firmware_cleanup | 2 +- usr/lib/archboot/cpio/hypervisor | 2 +- usr/lib/archboot/cpio/init | 2 +- usr/lib/archboot/cpio/installer | 2 +- usr/lib/archboot/cpio/installer_cleanup | 2 +- usr/lib/archboot/cpio/installer_common | 2 +- usr/lib/archboot/cpio/kexec | 2 +- usr/lib/archboot/cpio/kms | 2 +- usr/lib/archboot/cpio/licenses | 2 +- usr/lib/archboot/cpio/lshw | 2 +- usr/lib/archboot/cpio/lvm2 | 2 +- usr/lib/archboot/cpio/mdadm | 2 +- usr/lib/archboot/cpio/motd | 2 +- usr/lib/archboot/cpio/neovim | 2 +- usr/lib/archboot/cpio/net | 2 +- usr/lib/archboot/cpio/net_cleanup | 2 +- usr/lib/archboot/cpio/net_common | 2 +- usr/lib/archboot/cpio/pciutils | 2 +- usr/lib/archboot/cpio/platform | 2 +- usr/lib/archboot/cpio/remote | 2 +- usr/lib/archboot/cpio/secure_boot | 2 +- usr/lib/archboot/cpio/smartmontools | 2 +- usr/lib/archboot/cpio/usbutils | 2 +- usr/lib/archboot/cpio/vconsole | 2 +- usr/lib/archboot/cpio/wireless | 2 +- 45 files changed, 68 insertions(+), 68 deletions(-) diff --git a/usr/lib/archboot/cpio/acpi b/usr/lib/archboot/cpio/acpi index 8e1ce540a..9924b66e7 100644 --- a/usr/lib/archboot/cpio/acpi +++ b/usr/lib/archboot/cpio/acpi @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules '/acpi/' } diff --git a/usr/lib/archboot/cpio/base b/usr/lib/archboot/cpio/base index 762cf104e..82fe1f0ff 100644 --- a/usr/lib/archboot/cpio/base +++ b/usr/lib/archboot/cpio/base @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary head id cksum tail test uptime w who whoami xargs \ swapon uniq seq fdisk sfdisk cfdisk parted free less \ diff --git a/usr/lib/archboot/cpio/base_cleanup b/usr/lib/archboot/cpio/base_cleanup index 96b5f1681..c104ddcbc 100644 --- a/usr/lib/archboot/cpio/base_cleanup +++ b/usr/lib/archboot/cpio/base_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { _APPS="head id cksum tail test uptime w who whoami xargs \ swapon uniq seq fdisk sfdisk cfdisk parted free less \ diff --git a/usr/lib/archboot/cpio/base_common b/usr/lib/archboot/cpio/base_common index bd5535be4..daac99737 100644 --- a/usr/lib/archboot/cpio/base_common +++ b/usr/lib/archboot/cpio/base_common @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { ### setting up base structure map add_dir /root /mnt /sysroot /install /var/log /home /var/tmp diff --git a/usr/lib/archboot/cpio/base_common_cleanup b/usr/lib/archboot/cpio/base_common_cleanup index fbaa9e76d..1ea13ad81 100644 --- a/usr/lib/archboot/cpio/base_common_cleanup +++ b/usr/lib/archboot/cpio/base_common_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { # remove initrd-release rm -f /tmp/etc/initrd-release diff --git a/usr/lib/archboot/cpio/base_latest b/usr/lib/archboot/cpio/base_latest index 413ff250b..c6bd6a1e6 100644 --- a/usr/lib/archboot/cpio/base_latest +++ b/usr/lib/archboot/cpio/base_latest @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { ### adding default font and keymap add_binary loadkeys diff --git a/usr/lib/archboot/cpio/block_modules b/usr/lib/archboot/cpio/block_modules index 69ca75483..15d70041b 100644 --- a/usr/lib/archboot/cpio/block_modules +++ b/usr/lib/archboot/cpio/block_modules @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # created by Tobias Powalowski -build() +_run() { ### add block device support # sata, scsi, nvme diff --git a/usr/lib/archboot/cpio/cache b/usr/lib/archboot/cpio/cache index 2b455324f..2da93def3 100644 --- a/usr/lib/archboot/cpio/cache +++ b/usr/lib/archboot/cpio/cache @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_full_dir /var/cache/pacman/pkg } diff --git a/usr/lib/archboot/cpio/cache_cleanup b/usr/lib/archboot/cpio/cache_cleanup index 3d90ef4e3..64f69070c 100644 --- a/usr/lib/archboot/cpio/cache_cleanup +++ b/usr/lib/archboot/cpio/cache_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { rm -rf /var/cache/pacman/pkg } diff --git a/usr/lib/archboot/cpio/clock b/usr/lib/archboot/cpio/clock index 978ac7c3e..6d95ac564 100644 --- a/usr/lib/archboot/cpio/clock +++ b/usr/lib/archboot/cpio/clock @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary hwclock tzselect zic zdump map add_full_dir /usr/share/zoneinfo /usr/share/zoneinfo-leaps diff --git a/usr/lib/archboot/cpio/common_modules b/usr/lib/archboot/cpio/common_modules index af930affd..4cc565edf 100644 --- a/usr/lib/archboot/cpio/common_modules +++ b/usr/lib/archboot/cpio/common_modules @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { ### add pcspkr add_module pcspkr diff --git a/usr/lib/archboot/cpio/cpio.sh b/usr/lib/archboot/cpio/cpio.sh index f0e2fe71d..88e333113 100644 --- a/usr/lib/archboot/cpio/cpio.sh +++ b/usr/lib/archboot/cpio/cpio.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: GPL-3.0-or-later -# archboot-cpio.sh - modular tool for building an initramfs image +# archboot-cpio.sh - modular tool for _runing an initramfs image # simplified, stripped down, optimized for size and speed # by Tobias Powalowski @@ -232,44 +232,44 @@ add_binary() { return 0 } -initialize_buildroot() { - # creates a temporary directory for the buildroot and initialize it with a +initialize__runroot() { + # creates a temporary directory for the _runroot and initialize it with a # basic set of necessary directories and symlinks - local workdir='' kernver="$1" arch buildroot + local workdir='' kernver="$1" arch _runroot arch="$(uname -m)" if ! workdir="$(mktemp -d --tmpdir mkinitcpio.XXXXXX)"; then error 'Failed to create temporary working directory in %s' "${TMPDIR:-/tmp}" return 1 fi - buildroot="${2:-$workdir/root}" + _runroot="${2:-$workdir/root}" if [[ ! -w "${2:-$workdir}" ]]; then - error 'Unable to write to build root: %s' "$buildroot" + error 'Unable to write to _run root: %s' "$_runroot" return 1 fi # base directory structure - install -dm755 "$buildroot"/{new_root,proc,sys,dev,run,tmp,var,etc,usr/{local{,/bin,/sbin,/lib},lib,bin}} - ln -s "usr/lib" "$buildroot/lib" - ln -s "bin" "$buildroot/usr/sbin" - ln -s "usr/bin" "$buildroot/bin" - ln -s "usr/bin" "$buildroot/sbin" - ln -s "/run" "$buildroot/var/run" + install -dm755 "$_runroot"/{new_root,proc,sys,dev,run,tmp,var,etc,usr/{local{,/bin,/sbin,/lib},lib,bin}} + ln -s "usr/lib" "$_runroot/lib" + ln -s "bin" "$_runroot/usr/sbin" + ln -s "usr/bin" "$_runroot/bin" + ln -s "usr/bin" "$_runroot/sbin" + ln -s "/run" "$_runroot/var/run" case "$arch" in x86_64) - ln -s "lib" "$buildroot/usr/lib64" - ln -s "usr/lib" "$buildroot/lib64" + ln -s "lib" "$_runroot/usr/lib64" + ln -s "usr/lib" "$_runroot/lib64" ;; esac # kernel module dir - [[ "$kernver" != 'none' ]] && install -dm755 "$buildroot/usr/lib/modules/$kernver/kernel" + [[ "$kernver" != 'none' ]] && install -dm755 "$_runroot/usr/lib/modules/$kernver/kernel" # mount tables - ln -s ../proc/self/mounts "$buildroot/etc/mtab" - : >"$buildroot/etc/fstab" + ln -s ../proc/self/mounts "$_runroot/etc/mtab" + : >"$_runroot/etc/fstab" # add a blank ld.so.conf to keep ldconfig happy - : >"$buildroot/etc/ld.so.conf" + : >"$_runroot/etc/ld.so.conf" printf '%s' "$workdir" } -run_build_hook() { +run__run_hook() { local hook="$1" script='' # shellcheck disable=SC2034 local MODULES=() BINARIES=() FILES=() SCRIPT='' @@ -280,19 +280,19 @@ run_build_hook() { return 1 fi # source - unset -f build + unset -f _run # shellcheck disable=SC1090 if ! . "$script"; then error 'Failed to read %s' "$script" return 1 fi - if ! declare -f build >"${_NO_LOG}"; then - error "Hook '%s' has no build function" "${script}" + if ! declare -f _run >"${_NO_LOG}"; then + error "Hook '%s' has no _run function" "${script}" return 1 fi # run - msg2 "Running build hook: [%s]" "${script##*/}" - build + msg2 "Running _run hook: [%s]" "${script##*/}" + _run # if we made it this far, return successfully. Hooks can # do their own error catching if it's severe enough, and # we already capture errors from the add_* functions. diff --git a/usr/lib/archboot/cpio/cpufreq b/usr/lib/archboot/cpio/cpufreq index 20a17023e..7d7e9d5fe 100644 --- a/usr/lib/archboot/cpio/cpufreq +++ b/usr/lib/archboot/cpio/cpufreq @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules 'arch/x86/kernel/cpu/cpufreq|drivers/cpufreq' map add_binary cpupower cpufreq-bench_plot.sh diff --git a/usr/lib/archboot/cpio/devicemapper b/usr/lib/archboot/cpio/devicemapper index 4002975e6..86b0de9b0 100644 --- a/usr/lib/archboot/cpio/devicemapper +++ b/usr/lib/archboot/cpio/devicemapper @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules 'md/dm-*' map add_binary dmsetup dmeventd blkdeactivate dmstats cryptsetup \ diff --git a/usr/lib/archboot/cpio/dmidecode b/usr/lib/archboot/cpio/dmidecode index 9dea87e0e..a1defb9c6 100644 --- a/usr/lib/archboot/cpio/dmidecode +++ b/usr/lib/archboot/cpio/dmidecode @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules '/firmware/dmi-sysfs' map add_binary dmidecode biosdecode diff --git a/usr/lib/archboot/cpio/efibootmgr b/usr/lib/archboot/cpio/efibootmgr index 4c0a69440..9a52b6b83 100644 --- a/usr/lib/archboot/cpio/efibootmgr +++ b/usr/lib/archboot/cpio/efibootmgr @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_binary efibootmgr } diff --git a/usr/lib/archboot/cpio/efivar b/usr/lib/archboot/cpio/efivar index 88aa4e37a..14100e909 100644 --- a/usr/lib/archboot/cpio/efivar +++ b/usr/lib/archboot/cpio/efivar @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary efivar efisecdb } diff --git a/usr/lib/archboot/cpio/filesystems b/usr/lib/archboot/cpio/filesystems index 0ee3e2fde..6b9dedff4 100644 --- a/usr/lib/archboot/cpio/filesystems +++ b/usr/lib/archboot/cpio/filesystems @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules '/fs/(btrfs|cifs|exfat|ext4|f2fs|fat|hfs|hfsplus|isofs|jfs|nfs|nfsd|nilfs2|nls|ntfs3|udf|xfs|vboxsf)' add_all_modules '/(lib/|kernel|arch/*)/crypto' diff --git a/usr/lib/archboot/cpio/filesystems_cleanup b/usr/lib/archboot/cpio/filesystems_cleanup index 4839d1785..d6b4a8e25 100644 --- a/usr/lib/archboot/cpio/filesystems_cleanup +++ b/usr/lib/archboot/cpio/filesystems_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { _APPS="mkswap badblocks blkid debugfs dumpe2fs e2fsck e2image e2undo findfs fsck \ logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \ diff --git a/usr/lib/archboot/cpio/firmware b/usr/lib/archboot/cpio/firmware index a817edcc1..be59c3c53 100644 --- a/usr/lib/archboot/cpio/firmware +++ b/usr/lib/archboot/cpio/firmware @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { # add firmware files and licenses map add_full_dir "/lib/firmware" "/usr/share/licenses/linux-firmware" diff --git a/usr/lib/archboot/cpio/firmware_cleanup b/usr/lib/archboot/cpio/firmware_cleanup index b72c32d68..546a90c0c 100644 --- a/usr/lib/archboot/cpio/firmware_cleanup +++ b/usr/lib/archboot/cpio/firmware_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { rm -r /lib/firmware } diff --git a/usr/lib/archboot/cpio/hypervisor b/usr/lib/archboot/cpio/hypervisor index 766b7e422..7c3db61f5 100644 --- a/usr/lib/archboot/cpio/hypervisor +++ b/usr/lib/archboot/cpio/hypervisor @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules '/hv/hv_*' } diff --git a/usr/lib/archboot/cpio/init b/usr/lib/archboot/cpio/init index 92b538d5e..f7406a129 100644 --- a/usr/lib/archboot/cpio/init +++ b/usr/lib/archboot/cpio/init @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # created by Tobias Powalowski -build() { +_run() { ### init modules map add_module vfat? iso9660? nls_cp437? nls_ascii? cdrom? exfat? map add_binary bash sh blkid mount mountpoint switch_root bsdcpio mkfs.btrfs setfont \ diff --git a/usr/lib/archboot/cpio/installer b/usr/lib/archboot/cpio/installer index bad90712f..5530ff3e3 100644 --- a/usr/lib/archboot/cpio/installer +++ b/usr/lib/archboot/cpio/installer @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary genfstab arch-chroot pacstrap \ archboot-binary-check.sh archboot-not-installed.sh hwdetect diff --git a/usr/lib/archboot/cpio/installer_cleanup b/usr/lib/archboot/cpio/installer_cleanup index 8505ae922..c727584d9 100644 --- a/usr/lib/archboot/cpio/installer_cleanup +++ b/usr/lib/archboot/cpio/installer_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { # save RAM with deleting already copied content rm -rf /var/cache/pacman/pkg diff --git a/usr/lib/archboot/cpio/installer_common b/usr/lib/archboot/cpio/installer_common index 34b32ea2e..e00ebb1c1 100644 --- a/usr/lib/archboot/cpio/installer_common +++ b/usr/lib/archboot/cpio/installer_common @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_file /etc/archboot/defaults /usr/lib/archboot/common.sh \ /usr/lib/archboot/container.sh /usr/bin/archboot-"$(uname -m)"-create-container.sh \ diff --git a/usr/lib/archboot/cpio/kexec b/usr/lib/archboot/cpio/kexec index 866855487..9c771d730 100644 --- a/usr/lib/archboot/cpio/kexec +++ b/usr/lib/archboot/cpio/kexec @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary kexec vmcore-dmesg } diff --git a/usr/lib/archboot/cpio/kms b/usr/lib/archboot/cpio/kms index b84b33a5c..d84aad69d 100644 --- a/usr/lib/archboot/cpio/kms +++ b/usr/lib/archboot/cpio/kms @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { # add firmware files and licenses map add_full_dir "/lib/firmware/amdgpu" "/lib/firmware/i915" "/lib/firmware/nvidia" \ diff --git a/usr/lib/archboot/cpio/licenses b/usr/lib/archboot/cpio/licenses index 59b423a6c..27ad03b26 100644 --- a/usr/lib/archboot/cpio/licenses +++ b/usr/lib/archboot/cpio/licenses @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_full_dir /usr/share/licenses/common } diff --git a/usr/lib/archboot/cpio/lshw b/usr/lib/archboot/cpio/lshw index eb8e90a67..10b379345 100644 --- a/usr/lib/archboot/cpio/lshw +++ b/usr/lib/archboot/cpio/lshw @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_binary lshw for i in manuf oui pnpid; do diff --git a/usr/lib/archboot/cpio/lvm2 b/usr/lib/archboot/cpio/lvm2 index c66892882..f232c8747 100644 --- a/usr/lib/archboot/cpio/lvm2 +++ b/usr/lib/archboot/cpio/lvm2 @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { local symlink ### from thin-provisioning-tools diff --git a/usr/lib/archboot/cpio/mdadm b/usr/lib/archboot/cpio/mdadm index b5a14f364..248941f44 100644 --- a/usr/lib/archboot/cpio/mdadm +++ b/usr/lib/archboot/cpio/mdadm @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules -f 'dm-' 'drivers/md/*' map add_binary mdmon mdadm diff --git a/usr/lib/archboot/cpio/motd b/usr/lib/archboot/cpio/motd index c13445e11..93f0b48e6 100644 --- a/usr/lib/archboot/cpio/motd +++ b/usr/lib/archboot/cpio/motd @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { ### generate motd MOTD=$(mktemp /var/tmp/motd.XXXX) diff --git a/usr/lib/archboot/cpio/neovim b/usr/lib/archboot/cpio/neovim index 7788f72dc..2727b2f5f 100644 --- a/usr/lib/archboot/cpio/neovim +++ b/usr/lib/archboot/cpio/neovim @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_binary nvim map add_full_dir /usr/share/nvim diff --git a/usr/lib/archboot/cpio/net b/usr/lib/archboot/cpio/net index 85a106228..319097cb9 100644 --- a/usr/lib/archboot/cpio/net +++ b/usr/lib/archboot/cpio/net @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary arping clockdiff tracepath ssh genl \ ifstat ctstat rtstat lnstat nstat rtacct rtmon ss tc bridge \ diff --git a/usr/lib/archboot/cpio/net_cleanup b/usr/lib/archboot/cpio/net_cleanup index 5d624054f..66573260b 100644 --- a/usr/lib/archboot/cpio/net_cleanup +++ b/usr/lib/archboot/cpio/net_cleanup @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { _APPS="arping clockdiff tracepath ssh arpd \ genl ifstat ctstat rtstat lnstat nstat rtacct rtmon ss tc \ diff --git a/usr/lib/archboot/cpio/net_common b/usr/lib/archboot/cpio/net_common index 3bf75581c..0368e1084 100644 --- a/usr/lib/archboot/cpio/net_common +++ b/usr/lib/archboot/cpio/net_common @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules -f '_cs|b44|broadcom/bnx2x|brocade|cavium|chelsio|cisco|netronome|mellanox|myricom|qlogic|qualcomm' '/drivers/net/ethernet|/net/ipv4|/net/ipv6|/drivers/net/usb' map add_binary ip getent ping diff --git a/usr/lib/archboot/cpio/pciutils b/usr/lib/archboot/cpio/pciutils index d656ace8f..d1e77da1b 100644 --- a/usr/lib/archboot/cpio/pciutils +++ b/usr/lib/archboot/cpio/pciutils @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary lspci setpci update-pciids } diff --git a/usr/lib/archboot/cpio/platform b/usr/lib/archboot/cpio/platform index 8efa0d7e0..ad0da92b8 100644 --- a/usr/lib/archboot/cpio/platform +++ b/usr/lib/archboot/cpio/platform @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules -f 'media' '/platform/' } diff --git a/usr/lib/archboot/cpio/remote b/usr/lib/archboot/cpio/remote index faafeda98..c3aaa0db4 100644 --- a/usr/lib/archboot/cpio/remote +++ b/usr/lib/archboot/cpio/remote @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary findssl.sh scp sftp ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd \ exportfs nfsstat rpc.idmapd rpc.mountd rpc.nfsd rpc.statd rpcdebug showmount \ diff --git a/usr/lib/archboot/cpio/secure_boot b/usr/lib/archboot/cpio/secure_boot index 071aad1c9..c2d18ea2a 100644 --- a/usr/lib/archboot/cpio/secure_boot +++ b/usr/lib/archboot/cpio/secure_boot @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { # https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot _RUNNING_ARCH="$(uname -m)" diff --git a/usr/lib/archboot/cpio/smartmontools b/usr/lib/archboot/cpio/smartmontools index e92542b84..63c926971 100644 --- a/usr/lib/archboot/cpio/smartmontools +++ b/usr/lib/archboot/cpio/smartmontools @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { map add_binary smartctl smartd update-smart-drivedb map add_file /etc/conf.d/smartd /etc/smartd.conf diff --git a/usr/lib/archboot/cpio/usbutils b/usr/lib/archboot/cpio/usbutils index 844c97eb3..9fa0267ad 100644 --- a/usr/lib/archboot/cpio/usbutils +++ b/usr/lib/archboot/cpio/usbutils @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_binary lsusb } diff --git a/usr/lib/archboot/cpio/vconsole b/usr/lib/archboot/cpio/vconsole index 3c54d4c30..7d496a938 100644 --- a/usr/lib/archboot/cpio/vconsole +++ b/usr/lib/archboot/cpio/vconsole @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_full_dir /usr/share/kbd #add kbd binaries diff --git a/usr/lib/archboot/cpio/wireless b/usr/lib/archboot/cpio/wireless index 5e8f2dece..4f7cd4a97 100644 --- a/usr/lib/archboot/cpio/wireless +++ b/usr/lib/archboot/cpio/wireless @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Created by Tobias Powalowski -build () +_run () { add_all_modules -f '_cs|b43' '/net/wireless/|/net/ieee80211/|/net/mac80211/' if [[ "$(uname -m)" == "x86_64" ]]; then