diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index 7146072b4..b0f672075 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -2,8 +2,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later _KERNEL="/boot/Image.gz" _HOOKS=(cache cache_cleanup firmware firmware_mods firmware_cleanup common_mods - block_mods kms_mods filesystems_mods acpi_mods cpufreq_mods devicemapper_mods - hypervisor_mods net_mods dmidecode_mods platform_mods wireless_mods + block_mods kms_mods filesystems_mods cpufreq_mods devicemapper_mods + hypervisor_mods net_mods dmidecode_mods wireless_mods mdadm_mods systemd_mods mods_cleanup base_common base_common_cleanup base base_cleanup filesystems filesystems_cleanup net net_cleanup cpufreq devicemapper net_common dmidecode wireless installer_common installer clock vconsole diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index 6567ea9b7..f6fb26890 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -2,10 +2,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later _KERNEL="/boot/Image.gz" _HOOKS=(firmware firmware_mods common_mods kms_mods block_mods systemd_mods base_common base - installer_common installer clock vconsole acpi_mods motd net_common + installer_common installer clock vconsole motd net_common net_mods net devicemapper devicemapper_mods mdadm mdadm_mods lvm2 filesystems filesystems_mods remote cpufreq cpufreq_mods kexec efibootmgr pciutils - usbutils smartmontools licenses wireless wireless_mods neovim platform_mods + usbutils smartmontools licenses wireless wireless_mods neovim hypervisor_mods dmidecode dmidecode_mods secureboot efivar lshw) # COMPRESSION diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index 39326ac6b..a81478229 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -2,10 +2,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later _KERNEL="/usr/lib/modules/*/vmlinuz" _HOOKS=(firmware firmware_mods common_mods kms_mods block_mods systemd_mods base_common base - installer_common installer clock vconsole acpi_mods motd net_common + installer_common installer clock vconsole motd net_common net net_mods devicemapper devicemapper_mods mdadm mdadm_mods lvm2 filesystems filesystems_mods remote kexec efibootmgr pciutils usbutils smartmontools - licenses wireless wireless_mods neovim platform_mods hypervisor_mods + licenses wireless wireless_mods neovim hypervisor_mods secureboot efivar lshw) # COMPRESSION diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index 1979c4e6d..b3ebcd9f0 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -2,8 +2,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later _KERNEL="/usr/lib/modules/*/vmlinuz" _HOOKS=(cache cache_cleanup firmware firmware_mods firmware_cleanup common_mods - block_mods kms_mods filesystems_mods acpi_mods cpufreq_mods devicemapper_mods - hypervisor_mods net_mods dmidecode_mods platform_mods wireless_mods + block_mods kms_mods filesystems_mods cpufreq_mods devicemapper_mods + hypervisor_mods net_mods dmidecode_mods wireless_mods mdadm_mods systemd_mods mods_cleanup base_common base_common_cleanup base base_cleanup filesystems filesystems_cleanup net net_cleanup cpufreq devicemapper net_common dmidecode wireless installer_common installer clock vconsole diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index 0aa7fcd8a..e4fa32741 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -2,10 +2,10 @@ # SPDX-License-Identifier: GPL-3.0-or-later _KERNEL="/usr/lib/modules/*/vmlinuz" _HOOKS=(firmware firmware_mods common_mods kms_mods block_mods systemd_mods base_common base - installer_common installer clock vconsole acpi_mods motd net_common + installer_common installer clock vconsole motd net_common net_mods net devicemapper devicemapper_mods mdadm mdadm_mods lvm2 filesystems filesystems_mods remote cpufreq cpufreq_mods kexec efibootmgr pciutils - usbutils smartmontools licenses wireless wireless_mods neovim platform_mods + usbutils smartmontools licenses wireless wireless_mods neovim hypervisor_mods dmidecode dmidecode_mods secureboot efivar lshw) # COMPRESSION diff --git a/usr/lib/archboot/cpio/hooks/acpi_mods b/usr/lib/archboot/cpio/hooks/acpi_mods deleted file mode 100644 index 635c4e6ef..000000000 --- a/usr/lib/archboot/cpio/hooks/acpi_mods +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-or-later -# Created by Tobias Powalowski - -_run () -{ - _all_mods '/acpi/' -} -# vim: set ft=sh ts=4 sw=4 et: diff --git a/usr/lib/archboot/cpio/hooks/common_mods b/usr/lib/archboot/cpio/hooks/common_mods index 652038dda..d07dce98d 100644 --- a/usr/lib/archboot/cpio/hooks/common_mods +++ b/usr/lib/archboot/cpio/hooks/common_mods @@ -4,8 +4,12 @@ _run () { + ### acpi + _all_mods '/acpi/' ### add pcspkr _mod pcspkr + ### platform modules + _all_mods -f 'media' '/platform/' ### add init modules _map _mod zram btrfs zstd libcrc32c ### keyboard modules diff --git a/usr/lib/archboot/cpio/hooks/platform_mods b/usr/lib/archboot/cpio/hooks/platform_mods deleted file mode 100644 index d53af4aba..000000000 --- a/usr/lib/archboot/cpio/hooks/platform_mods +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-or-later -# Created by Tobias Powalowski - -_run () -{ - _all_mods -f 'media' '/platform/' -} - -# vim: set ft=sh ts=4 sw=4 et: