From e694de833e06b5ad6b520040a7dcf358fd336054 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 10 Nov 2023 16:35:54 +0100 Subject: [PATCH] merge efibootmgr and efivar into efi hook --- etc/archboot/aarch64-update_installer.conf | 2 +- etc/archboot/aarch64.conf | 4 ++-- etc/archboot/riscv64.conf | 4 ++-- etc/archboot/x86_64-update_installer.conf | 2 +- etc/archboot/x86_64.conf | 4 ++-- usr/lib/archboot/cpio/hooks/{efibootmgr => efi} | 2 +- usr/lib/archboot/cpio/hooks/efivar | 10 ---------- 7 files changed, 9 insertions(+), 19 deletions(-) rename usr/lib/archboot/cpio/hooks/{efibootmgr => efi} (78%) delete mode 100644 usr/lib/archboot/cpio/hooks/efivar diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index ce9090392..83fb3febd 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -8,7 +8,7 @@ _HOOKS=(cache cache_cleanup firmware firmware_mods firmware_cleanup base_common_ base_common_system_cleanup base_system base_system_cleanup filesystems filesystems_cleanup net net_cleanup cpufreq devicemapper net_common dmidecode wireless installer_common installer clock vconsole motd mdadm lvm2 remote kexec - efibootmgr pciutils usbutils smartmontools licenses neovim secureboot efivar lshw) + pciutils usbutils smartmontools licenses neovim secureboot efi lshw) # COMPRESSION # Use 'cat' to create an uncompressed image. diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index b3f5fb6a5..3d0bbf499 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -4,9 +4,9 @@ _KERNEL="/boot/Image.gz" _HOOKS=(firmware firmware_mods kms_mods block_mods systemd_mods base_common base_common_mods base_common_system base_system 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 + filesystems_mods remote cpufreq cpufreq_mods kexec pciutils usbutils smartmontools licenses wireless wireless_mods neovim - hypervisor_mods dmidecode secureboot efivar lshw) + hypervisor_mods dmidecode secureboot efi lshw) # COMPRESSION # Use 'cat' to create an uncompressed image. diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index e051453f2..14993026c 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -4,8 +4,8 @@ _KERNEL="/usr/lib/modules/*/vmlinuz" _HOOKS=(firmware firmware_mods kms_mods block_mods systemd_mods base_common base_common_mods base_common_system base_system installer_common installer clock vconsole motd net_common net_mods net devicemapper devicemapper_mods mdadm mdadm_mods lvm2 filesystems - filesystems_mods remote kexec efibootmgr pciutils usbutils smartmontools - licenses wireless wireless_mods neovim hypervisor_mods secureboot efivar lshw) + filesystems_mods remote kexec pciutils usbutils smartmontools + licenses wireless wireless_mods neovim hypervisor_mods secureboot efi lshw) # COMPRESSION # Use 'cat' to create an uncompressed image. diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index 6b9dfa9f2..ea2df3068 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -8,7 +8,7 @@ _HOOKS=(cache cache_cleanup firmware firmware_mods firmware_cleanup base_common_ base_common_system_cleanup base_system base_system_cleanup filesystems filesystems_cleanup net net_cleanup cpufreq devicemapper net_common dmidecode wireless installer_common installer clock vconsole motd mdadm lvm2 remote kexec - efibootmgr pciutils usbutils smartmontools licenses neovim secureboot efivar lshw) + pciutils usbutils smartmontools licenses neovim secureboot efi lshw) # COMPRESSION # Use 'cat' to create an uncompressed image. diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index 82d2bdf1f..55b8a7645 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -4,9 +4,9 @@ _KERNEL="/usr/lib/modules/*/vmlinuz" _HOOKS=(firmware firmware_mods kms_mods block_mods systemd_mods base_common base_common_mods base_common_system base_system 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 + filesystems_mods remote cpufreq cpufreq_mods kexec pciutils usbutils smartmontools licenses wireless wireless_mods neovim - hypervisor_mods dmidecode secureboot efivar lshw) + hypervisor_mods dmidecode secureboot efi lshw) # COMPRESSION # Use 'cat' to create an uncompressed image. diff --git a/usr/lib/archboot/cpio/hooks/efibootmgr b/usr/lib/archboot/cpio/hooks/efi similarity index 78% rename from usr/lib/archboot/cpio/hooks/efibootmgr rename to usr/lib/archboot/cpio/hooks/efi index 131f749b3..ee9e8443c 100644 --- a/usr/lib/archboot/cpio/hooks/efibootmgr +++ b/usr/lib/archboot/cpio/hooks/efi @@ -4,7 +4,7 @@ _run () { - _binary efibootmgr + _map _binary efivar efisecdb efibootmgr } # vim: set ft=sh ts=4 sw=4 et: diff --git a/usr/lib/archboot/cpio/hooks/efivar b/usr/lib/archboot/cpio/hooks/efivar deleted file mode 100644 index 9534fa108..000000000 --- a/usr/lib/archboot/cpio/hooks/efivar +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-or-later -# Created by Tobias Powalowski - -_run () -{ - _map _binary efivar efisecdb -} - -# vim: set ft=sh ts=4 sw=4 et: