From b73222958a18213f3150b80ca4481d3892bacfab Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Wed, 26 Apr 2023 21:53:51 +0200 Subject: [PATCH] merge hwdetect into installer hoom --- etc/archboot/aarch64-update_installer.conf | 2 +- etc/archboot/aarch64.conf | 2 +- etc/archboot/riscv64.conf | 2 +- etc/archboot/x86_64-update_installer.conf | 2 +- etc/archboot/x86_64.conf | 2 +- usr/lib/initcpio/install/archboot_hwdetect | 16 ---------------- usr/lib/initcpio/install/archboot_installer | 2 +- 7 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 usr/lib/initcpio/install/archboot_hwdetect diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index 40feff409..8dd322511 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -13,7 +13,7 @@ archboot_base_cleanup archboot_filesystems archboot_filesystems_cleanup archboot archboot_net_cleanup archboot_acpi archboot_cpufreq \ archboot_devicemapper archboot_hypervisor archboot_net_common archboot_platform archboot_wireless \ archboot_wireless_staging archboot_installer_common archboot_installer archboot_installer_cleanup \ -archboot_tz archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm \ +archboot_tz archboot_keymap archboot_motd archboot_mdadm \ archboot_lvm2 archboot_remote archboot_kexec archboot_efibootmgr archboot_pciutils \ archboot_usbutils archboot_smartmontools archboot_licenses \ archboot_neovim \ diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index c9230d76b..2d725855c 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -8,7 +8,7 @@ # Please change the hooks only if you know what you are doing. HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \ archboot_installer_common archboot_installer archboot_tz archboot_keymap \ -archboot_acpi archboot_motd archboot_hwdetect archboot_net_common \ +archboot_acpi archboot_motd archboot_net_common \ archboot_net archboot_devicemapper archboot_mdadm \ archboot_lvm2 archboot_filesystems archboot_remote archboot_cpufreq \ archboot_kexec archboot_efibootmgr archboot_pciutils archboot_usbutils \ diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index 49cfc7e8f..c119dc9d1 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -8,7 +8,7 @@ # Please change the hooks only if you know what you are doing. HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \ archboot_installer_common archboot_installer archboot_tz archboot_keymap \ -archboot_acpi archboot_motd archboot_hwdetect archboot_net_common \ +archboot_acpi archboot_motd archboot_net_common \ archboot_net archboot_devicemapper archboot_mdadm \ archboot_lvm2 archboot_filesystems archboot_remote archboot_kexec \ archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_smartmontools \ diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index 8a46b1513..3e99b26eb 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -13,7 +13,7 @@ archboot_net_cleanup lvm2 archboot_acpi archboot_cpufreq \ archboot_devicemapper archboot_hypervisor archboot_net_common \ archboot_dmidecode archboot_platform archboot_wireless archboot_wireless_staging \ archboot_installer_common archboot_installer archboot_installer_cleanup archboot_tz \ -archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm archboot_lvm2 \ +archboot_keymap archboot_motd archboot_mdadm archboot_lvm2 \ archboot_remote archboot_kexec archboot_efibootmgr \ archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \ archboot_neovim \ diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index fcdf4bd9b..9745e7258 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -8,7 +8,7 @@ # Please change the hooks only if you know what you are doing. HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \ archboot_installer_common archboot_installer archboot_tz archboot_keymap -archboot_acpi archboot_motd archboot_hwdetect \ +archboot_acpi archboot_motd \ archboot_net_common archboot_net archboot_devicemapper archboot_mdadm \ archboot_lvm2 archboot_filesystems archboot_remote \ archboot_cpufreq archboot_kexec archboot_efibootmgr archboot_pciutils \ diff --git a/usr/lib/initcpio/install/archboot_hwdetect b/usr/lib/initcpio/install/archboot_hwdetect deleted file mode 100644 index 42e4c2a7c..000000000 --- a/usr/lib/initcpio/install/archboot_hwdetect +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-2.0-only -# Created by Tobias Powalowski - -build () -{ - add_binary hwdetect -} - -help () -{ -cat <