root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

rename functions

Browse source
This commit is contained in:
Tobias Powalowski 2023-10-19 21:11:19 +02:00
parent 8ec107e165
commit eaedfddfc1
18 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/bin/archboot-cpio.sh
View file

@ -64,7 +64,7 @@ if (( ${#_HOOKS[*]} == 0 )); then
fi fi
echo "Using kernel: ${_KERNEL}" echo "Using kernel: ${_KERNEL}"
echo "Detected kernel version: ${_KERNELVERSION}" echo "Detected kernel version: ${_KERNELVERSION}"
_builtin_modules _builtin_mods
_HOOK_COUNT=1 _HOOK_COUNT=1
_HOOKS_END_COUNT="$(echo "${_HOOKS[@]}" | wc -w)" _HOOKS_END_COUNT="$(echo "${_HOOKS[@]}" | wc -w)"
if [[ "${_HOOKS_END_COUNT}" -lt 10 ]]; then if [[ "${_HOOKS_END_COUNT}" -lt 10 ]]; then
@ -83,7 +83,7 @@ for i in "${_HOOKS[@]}"; do
_HOOK_COUNT="$((_HOOK_COUNT+1))" _HOOK_COUNT="$((_HOOK_COUNT+1))"
done done
_install_libs _install_libs
_install_modules "${!_MOD_PATH[@]}" _install_mods "${!_MOD_PATH[@]}"
ldconfig -r "${_ROOTFS}" &>"${_NO_LOG}" || exit 1 ldconfig -r "${_ROOTFS}" &>"${_NO_LOG}" || exit 1
# remove /var/cache/ldconfig/aux-cache for reproducibility # remove /var/cache/ldconfig/aux-cache for reproducibility
rm -f -- "${_ROOTFS}/var/cache/ldconfig/aux-cache" rm -f -- "${_ROOTFS}/var/cache/ldconfig/aux-cache"

14
usr/lib/archboot/cpio/cpio.sh
View file

@ -40,7 +40,7 @@ _cleanup() {
fi fi
} }
_builtin_modules() { _builtin_mods() {
while IFS=.= read -rd '' _MODULE _FIELD _VALUE; do while IFS=.= read -rd '' _MODULE _FIELD _VALUE; do
_INCLUDED_MODS[${_MODULE//-/_}]=2 _INCLUDED_MODS[${_MODULE//-/_}]=2
case "$_FIELD" in case "$_FIELD" in
@ -59,7 +59,7 @@ _map() {
return "${_RETURN}" return "${_RETURN}"
} }
_filter_modules() { _filter_mods() {
# Add modules to the rootfs, filtered by grep. # Add modules to the rootfs, filtered by grep.
# $@: filter arguments to grep # $@: filter arguments to grep
# -f FILTER: ERE to filter found modules # -f FILTER: ERE to filter found modules
@ -81,16 +81,16 @@ _filter_modules() {
(( _COUNT )) (( _COUNT ))
} }
_all_modules() { _all_mods() {
# Add modules to the initcpio. # Add modules to the initcpio.
# $@: arguments to all_modules # $@: arguments to all_modules
local -a _MODS local -a _MODS
mapfile -t _MODS < <(_filter_modules "$@") mapfile -t _MODS < <(_filter_mods "$@")
_map _module "${_MODS[@]}" _map _module "${_MODS[@]}"
return $(( !${#_MODS[*]} )) return $(( !${#_MODS[*]} ))
} }
_module() { _mod() {
# Add a kernel module to the rootfs. Dependencies will be # Add a kernel module to the rootfs. Dependencies will be
# discovered and added. # discovered and added.
# $1: module name # $1: module name
@ -116,7 +116,7 @@ _module() {
softdep) read -ra _SOFT <<<"${_VALUE}" softdep) read -ra _SOFT <<<"${_VALUE}"
for i in "${_SOFT[@]}"; do for i in "${_SOFT[@]}"; do
[[ ${i} == *: ]] && continue [[ ${i} == *: ]] && continue
_module "${i}?" _mod "${i}?"
done done
;; ;;
esac esac
@ -206,7 +206,7 @@ _run_hook() {
_run _run
} }
_install_modules() { _install_mods() {
echo "Adding kernel modules..." echo "Adding kernel modules..."
tar --hard-dereference -C / -cpf - "$@" | tar -C "${_ROOTFS}" -xpf - tar --hard-dereference -C / -cpf - "$@" | tar -C "${_ROOTFS}" -xpf -
echo "Generating module dependencies..." echo "Generating module dependencies..."

2
usr/lib/archboot/cpio/hooks/acpi
View file

@ -4,6 +4,6 @@
_run () _run ()
{ {
_all_modules '/acpi/' _all_mods '/acpi/'
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/archboot/cpio/hooks/base_common
View file

@ -108,7 +108,7 @@ var/lib/pacman/local \
### add systemd ### add systemd
# add systemd kernel modules # add systemd kernel modules
_all_modules 'nfs|autofs4|loop' _all_mods 'nfs|autofs4|loop'
_map _binary mount.nfs4 umount.nfs umount.nfs4 mount.nfs setfont loadkeys _map _binary mount.nfs4 umount.nfs umount.nfs4 mount.nfs setfont loadkeys
#dbus files #dbus files

16
usr/lib/archboot/cpio/hooks/block_modules
View file

@ -6,20 +6,20 @@ _run()
{ {
### add block device support ### add block device support
# sata, scsi, nvme # sata, scsi, nvme
_map _all_modules 'scsi/.*ata' \ _map _all_mods 'scsi/.*ata' \
'ata/(ahci|pdc_adma|ata_piix|ata_generic)' 'ata/(ahci|pdc_adma|ata_piix|ata_generic)'
_all_modules -f 'pcmcia|scsi/(ch|imm|ppa|sg|st)|rdma|rnbd|rbd|nbd|qed|cxgb|bnx2|csiostor|qla1280|qla2xxx|qla4xxx|iscsi|brd|aoe|null_blk|pktcdvd|drbd|floppy|lpfc|ublk_drv|bfa|snic|fnic|fcoe' '/(block|scsi|fusion|nvme)/' _all_mods -f 'pcmcia|scsi/(ch|imm|ppa|sg|st)|rdma|rnbd|rbd|nbd|qed|cxgb|bnx2|csiostor|qla1280|qla2xxx|qla4xxx|iscsi|brd|aoe|null_blk|pktcdvd|drbd|floppy|lpfc|ublk_drv|bfa|snic|fnic|fcoe' '/(block|scsi|fusion|nvme)/'
_all_modules -f 'parport' 'ata/sata_' _all_mods -f 'parport' 'ata/sata_'
# usb # usb
_all_modules '/drivers/usb/storage/' _all_mods '/drivers/usb/storage/'
# mmc # mmc
_all_modules -f '_cs' '/(drivers/mmc|tifm_)' _all_mods -f '_cs' '/(drivers/mmc|tifm_)'
# spi (mmc in spi mode) # spi (mmc in spi mode)
_all_modules -f 'butterfly|lm70llp' '/drivers/spi/' _all_mods -f 'butterfly|lm70llp' '/drivers/spi/'
# nvdimm # nvdimm
_all_modules '/drivers/nvdimm/' _all_mods '/drivers/nvdimm/'
# Intel Volume Management Device # Intel Volume Management Device
_all_modules 'vmd' _all_mods 'vmd'
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

14
usr/lib/archboot/cpio/hooks/common_modules
View file

@ -5,15 +5,15 @@
_run () _run ()
{ {
### add pcspkr ### add pcspkr
_module pcspkr _mod pcspkr
### add init modules ### add init modules
_map _module zram btrfs zstd libcrc32c _map _mod zram btrfs zstd libcrc32c
### keyboard modules ### keyboard modules
_all_modules -f '_cs|ssb-hcd' '/usb/host' _all_mods -f '_cs|ssb-hcd' '/usb/host'
_all_modules '/hid/hid-(alps|apple|asus|belkin|cherry|chicony|corsair|elan|hyperv|kensignton|lenovo|logitech|magicmouse|microsoft|razer|redragon|roccat|samsung|sony|speedlink|steelseries)' _all_mods '/hid/hid-(alps|apple|asus|belkin|cherry|chicony|corsair|elan|hyperv|kensignton|lenovo|logitech|magicmouse|microsoft|razer|redragon|roccat|samsung|sony|speedlink|steelseries)'
_module usbhid _mod usbhid
_all_modules -f 'parkbd' '/input/serio|mouse|keyboard/(applespi|atkbd)' _all_mods -f 'parkbd' '/input/serio|mouse|keyboard/(applespi|atkbd)'
_all_modules -f '9pnet|bluetooth|fs' 'virtio' _all_mods -f '9pnet|bluetooth|fs' 'virtio'
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/archboot/cpio/hooks/cpufreq
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_all_modules 'arch/x86/kernel/cpu/cpufreq|drivers/cpufreq' _all_mods 'arch/x86/kernel/cpu/cpufreq|drivers/cpufreq'
_map _binary cpupower cpufreq-bench_plot.sh _map _binary cpupower cpufreq-bench_plot.sh
_file /etc/cpufreq-bench.conf _file /etc/cpufreq-bench.conf
} }

2
usr/lib/archboot/cpio/hooks/devicemapper
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_all_modules 'md/dm-*' _all_mods 'md/dm-*'
_map _binary dmsetup dmeventd blkdeactivate dmstats cryptsetup \ _map _binary dmsetup dmeventd blkdeactivate dmstats cryptsetup \
integritysetup veritysetup integritysetup veritysetup
_dir /dev/mapper _dir /dev/mapper

2
usr/lib/archboot/cpio/hooks/dmidecode
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_all_modules '/firmware/dmi-sysfs' _all_mods '/firmware/dmi-sysfs'
_map _binary dmidecode biosdecode _map _binary dmidecode biosdecode
} }

6
usr/lib/archboot/cpio/hooks/filesystems
View file

@ -4,9 +4,9 @@
_run () _run ()
{ {
_all_modules '/fs/(btrfs|cifs|exfat|ext4|f2fs|fat|hfs|hfsplus|isofs|jfs|nfs|nfsd|nilfs2|nls|ntfs3|udf|xfs|vboxsf)' _all_mods '/fs/(btrfs|cifs|exfat|ext4|f2fs|fat|hfs|hfsplus|isofs|jfs|nfs|nfsd|nilfs2|nls|ntfs3|udf|xfs|vboxsf)'
_all_modules '/(lib/|kernel|arch/*)/crypto' _all_mods '/(lib/|kernel|arch/*)/crypto'
_map _module crypto-crc32c crypto-crc32 libcrc32c configfs nls_cp437 nls_ascii _map _mod crypto-crc32c crypto-crc32 libcrc32c configfs nls_cp437 nls_ascii
_map _binary mkswap badblocks blkid debugfs dumpe2fs e2fsck \ _map _binary mkswap badblocks blkid debugfs dumpe2fs e2fsck \
e2image e2undo findfs fsck logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \ e2image e2undo findfs fsck logsave mkfs.ext2 resize2fs chattr lsattr e2freefrag filefrag \
jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs xfs_copy xfs_db xfs_estimate xfs_fsr xfs_io \ jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs xfs_copy xfs_db xfs_estimate xfs_fsr xfs_io \

2
usr/lib/archboot/cpio/hooks/firmware
View file

@ -7,7 +7,7 @@ _run ()
# add firmware files and licenses # add firmware files and licenses
tar -C / --exclude=./lib/firmware/{amphion,"as102*",atusb,av7110,cadence,cavium,"cmmb*",cis,cpia2,cnm,"ct*","cxgb*","cmmb*",dabusb,dpaa2,dsp56k,"dvb*",edgeport,emi26,emi62,ess,"f2255usb*",go7007,"hfi1*",inside-secure,"isdbt*","keyspan*",korg,meson,"lgs8g75*","lt9611uxc*",moxa,"mts*","myri10ge*",myricom,nxp,ositech,"qat*",sb16,"s2250*","s5p-*","sms1*",rtl_bt,"tdmb*",ttusb-budget,ueagle-atm,"usbdux*",ti,ti-keystone,"v4l*",vicam,vxge,"whiteheat*",yam,yamaha,"*.txt*","*README*"} --hard-dereference -cpf - ./lib/firmware | tar -C "${_ROOTFS}" -xpf - tar -C / --exclude=./lib/firmware/{amphion,"as102*",atusb,av7110,cadence,cavium,"cmmb*",cis,cpia2,cnm,"ct*","cxgb*","cmmb*",dabusb,dpaa2,dsp56k,"dvb*",edgeport,emi26,emi62,ess,"f2255usb*",go7007,"hfi1*",inside-secure,"isdbt*","keyspan*",korg,meson,"lgs8g75*","lt9611uxc*",moxa,"mts*","myri10ge*",myricom,nxp,ositech,"qat*",sb16,"s2250*","s5p-*","sms1*",rtl_bt,"tdmb*",ttusb-budget,ueagle-atm,"usbdux*",ti,ti-keystone,"v4l*",vicam,vxge,"whiteheat*",yam,yamaha,"*.txt*","*README*"} --hard-dereference -cpf - ./lib/firmware | tar -C "${_ROOTFS}" -xpf -
_full_dir "/usr/share/licenses/linux-firmware" _full_dir "/usr/share/licenses/linux-firmware"
_all_modules "/firmware/" _all_mods "/firmware/"
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/archboot/cpio/hooks/hypervisor
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_all_modules '/hv/hv_*' _all_mods '/hv/hv_*'
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/archboot/cpio/hooks/init
View file

@ -4,7 +4,7 @@
_run() { _run() {
### init modules ### init modules
_map _module vfat iso9660 nls_cp437 nls_ascii cdrom exfat _map _mod vfat iso9660 nls_cp437 nls_ascii cdrom exfat
_map _binary bash sh blkid mount mountpoint switch_root bsdcpio mkfs.btrfs setfont \ _map _binary bash sh blkid mount mountpoint switch_root bsdcpio mkfs.btrfs setfont \
/usr/lib/systemd/systemd-udevd udevadm systemd-tmpfiles kmod insmod modprobe \ /usr/lib/systemd/systemd-udevd udevadm systemd-tmpfiles kmod insmod modprobe \
gzip uname cat cp dmesg grep ln ls mv rm umount lsblk rmmod cut sed find mkdir dialog gzip uname cat cp dmesg grep ln ls mv rm umount lsblk rmmod cut sed find mkdir dialog

4
usr/lib/archboot/cpio/hooks/kms
View file

@ -11,11 +11,11 @@ _run ()
_full_dir "/usr/share/licenses/linux-firmware" _full_dir "/usr/share/licenses/linux-firmware"
### kmx modules ### kmx modules
# AGP and DRM modules for GPUs # AGP and DRM modules for GPUs
_map _all_modules '/drivers/char/agp/' '/drivers/gpu/drm/' _map _all_mods '/drivers/char/agp/' '/drivers/gpu/drm/'
# modules that implement the privacy screen interface # modules that implement the privacy screen interface
# TODO: Replace with dynamic lookup of modules that depend on the drm_privacy_screen_register symbol # TODO: Replace with dynamic lookup of modules that depend on the drm_privacy_screen_register symbol
# See https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/issues/132 # See https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/issues/132
_map _all_modules 'chromeos_privacy_screen?' 'thinkpad_acpi?' _map _all_mods 'chromeos_privacy_screen?' 'thinkpad_acpi?'
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/archboot/cpio/hooks/mdadm
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_all_modules -f 'dm-' 'drivers/md/*' _all_mods -f 'dm-' 'drivers/md/*'
_map _binary mdmon mdadm _map _binary mdmon mdadm
_file /etc/mdadm.conf _file /etc/mdadm.conf
_file /usr/share/mdadm/mdcheck _file /usr/share/mdadm/mdcheck

2
usr/lib/archboot/cpio/hooks/net_common
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_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' _all_mods -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 _binary ip getent ping _map _binary ip getent ping
_file_rename /usr/bin/archboot-network.sh /usr/bin/network _file_rename /usr/bin/archboot-network.sh /usr/bin/network
# start dhcpcd on startup # start dhcpcd on startup

2
usr/lib/archboot/cpio/hooks/platform
View file

@ -4,7 +4,7 @@
_run () _run ()
{ {
_all_modules -f 'media' '/platform/' _all_mods -f 'media' '/platform/'
} }
# vim: set ft=sh ts=4 sw=4 et: # vim: set ft=sh ts=4 sw=4 et:

4
usr/lib/archboot/cpio/hooks/wireless
View file

@ -4,10 +4,10 @@
_run () _run ()
{ {
_all_modules -f '_cs|b43' '/net/wireless/|/net/ieee80211/|/net/mac80211/' _all_mods -f '_cs|b43' '/net/wireless/|/net/ieee80211/|/net/mac80211/'
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
# add broadcom wl support # add broadcom wl support
_module wl.ko _mod wl.ko
_map _file /usr/lib/modprobe.d/broadcom-wl.conf \ _map _file /usr/lib/modprobe.d/broadcom-wl.conf \
/usr/share/licenses/broadcom-wl/LICENSE /usr/share/licenses/broadcom-wl/LICENSE
fi fi