mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
merge hwdetect into installer hoom
This commit is contained in:
parent
4d864878fc
commit
b73222958a
7 changed files with 6 additions and 22 deletions
|
@ -13,7 +13,7 @@ archboot_base_cleanup archboot_filesystems archboot_filesystems_cleanup archboot
|
||||||
archboot_net_cleanup archboot_acpi archboot_cpufreq \
|
archboot_net_cleanup archboot_acpi archboot_cpufreq \
|
||||||
archboot_devicemapper archboot_hypervisor archboot_net_common archboot_platform archboot_wireless \
|
archboot_devicemapper archboot_hypervisor archboot_net_common archboot_platform archboot_wireless \
|
||||||
archboot_wireless_staging archboot_installer_common archboot_installer archboot_installer_cleanup \
|
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_lvm2 archboot_remote archboot_kexec archboot_efibootmgr archboot_pciutils \
|
||||||
archboot_usbutils archboot_smartmontools archboot_licenses \
|
archboot_usbutils archboot_smartmontools archboot_licenses \
|
||||||
archboot_neovim \
|
archboot_neovim \
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \
|
HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \
|
||||||
archboot_installer_common archboot_installer archboot_tz archboot_keymap \
|
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_net archboot_devicemapper archboot_mdadm \
|
||||||
archboot_lvm2 archboot_filesystems archboot_remote archboot_cpufreq \
|
archboot_lvm2 archboot_filesystems archboot_remote archboot_cpufreq \
|
||||||
archboot_kexec archboot_efibootmgr archboot_pciutils archboot_usbutils \
|
archboot_kexec archboot_efibootmgr archboot_pciutils archboot_usbutils \
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \
|
HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \
|
||||||
archboot_installer_common archboot_installer archboot_tz archboot_keymap \
|
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_net archboot_devicemapper archboot_mdadm \
|
||||||
archboot_lvm2 archboot_filesystems archboot_remote archboot_kexec \
|
archboot_lvm2 archboot_filesystems archboot_remote archboot_kexec \
|
||||||
archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_smartmontools \
|
archboot_efibootmgr archboot_pciutils archboot_usbutils archboot_smartmontools \
|
||||||
|
|
|
@ -13,7 +13,7 @@ archboot_net_cleanup lvm2 archboot_acpi archboot_cpufreq \
|
||||||
archboot_devicemapper archboot_hypervisor archboot_net_common \
|
archboot_devicemapper archboot_hypervisor archboot_net_common \
|
||||||
archboot_dmidecode archboot_platform archboot_wireless archboot_wireless_staging \
|
archboot_dmidecode archboot_platform archboot_wireless archboot_wireless_staging \
|
||||||
archboot_installer_common archboot_installer archboot_installer_cleanup archboot_tz \
|
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_remote archboot_kexec archboot_efibootmgr \
|
||||||
archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \
|
archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \
|
||||||
archboot_neovim \
|
archboot_neovim \
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# Please change the hooks only if you know what you are doing.
|
# Please change the hooks only if you know what you are doing.
|
||||||
HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \
|
HOOKS=(archboot_firmware archboot_common_modules archboot_base_common archboot_base \
|
||||||
archboot_installer_common archboot_installer archboot_tz archboot_keymap
|
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_net_common archboot_net archboot_devicemapper archboot_mdadm \
|
||||||
archboot_lvm2 archboot_filesystems archboot_remote \
|
archboot_lvm2 archboot_filesystems archboot_remote \
|
||||||
archboot_cpufreq archboot_kexec archboot_efibootmgr archboot_pciutils \
|
archboot_cpufreq archboot_kexec archboot_efibootmgr archboot_pciutils \
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
|
||||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
|
||||||
|
|
||||||
build ()
|
|
||||||
{
|
|
||||||
add_binary hwdetect
|
|
||||||
}
|
|
||||||
|
|
||||||
help ()
|
|
||||||
{
|
|
||||||
cat <<HELPEOF
|
|
||||||
This hook will add hwdetect on an archboot image.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
||||||
# vim: set ft=sh ts=4 sw=4 et:
|
|
|
@ -5,7 +5,7 @@
|
||||||
build ()
|
build ()
|
||||||
{
|
{
|
||||||
map add_binary genfstab arch-chroot pacstrap \
|
map add_binary genfstab arch-chroot pacstrap \
|
||||||
archboot-binary-check.sh archboot-not-installed.sh archboot-locale.sh
|
archboot-binary-check.sh archboot-not-installed.sh archboot-locale.sh hwdetect
|
||||||
add_file "/usr/bin/archboot-setup.sh" "/usr/bin/setup"
|
add_file "/usr/bin/archboot-setup.sh" "/usr/bin/setup"
|
||||||
add_file "/usr/bin/archboot-quickinst.sh" "/usr/bin/quickinst"
|
add_file "/usr/bin/archboot-quickinst.sh" "/usr/bin/quickinst"
|
||||||
add_file "/usr/bin/archboot-copy-mountpoint.sh" "/usr/bin/copy-mountpoint.sh"
|
add_file "/usr/bin/archboot-copy-mountpoint.sh" "/usr/bin/copy-mountpoint.sh"
|
||||||
|
|
Loading…
Reference in a new issue