From 759d755b9dbd28793785c0ff87b7d4f5c257de9a Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 6 Feb 2023 08:37:32 +0100 Subject: [PATCH] remove ddrescue fsarchiver and chntpw, all programs can be easily installed --- etc/archboot/aarch64-update_installer.conf | 4 ++-- etc/archboot/aarch64.conf | 4 ++-- etc/archboot/riscv64-update_installer.conf | 4 ++-- etc/archboot/riscv64.conf | 4 ++-- etc/archboot/x86_64-update_installer.conf | 4 ++-- etc/archboot/x86_64.conf | 4 ++-- usr/lib/initcpio/install/archboot_chntpw | 16 ---------------- usr/lib/initcpio/install/archboot_ddrescue | 16 ---------------- usr/lib/initcpio/install/archboot_fsarchiver | 16 ---------------- 9 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 usr/lib/initcpio/install/archboot_chntpw delete mode 100644 usr/lib/initcpio/install/archboot_ddrescue delete mode 100644 usr/lib/initcpio/install/archboot_fsarchiver diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index cb4c4ba86..6c57abea2 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -18,8 +18,8 @@ archboot_devicemapper archboot_hypervisor archboot_net_common archboot_platform archboot_wireless_staging archboot_installer_common archboot_installer archboot_installer_cleanup \ archboot_tz archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev \ archboot_lvm2 archboot_remote archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils \ -archboot_usbutils archboot_smartmontools archboot_licenses archboot_fsarchiver \ -archboot_neovim archboot_ddrescue \ +archboot_usbutils archboot_smartmontools archboot_licenses \ +archboot_neovim \ archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index 556784ee0..1a4a56913 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -15,8 +15,8 @@ block archboot_net_common archboot_net keyboard archboot_devicemapper archboot_m mdadm_udev lvm2 archboot_lvm2 encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq \ archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ -archboot_fsarchiver archboot_neovim \ -archboot_ddrescue archboot_platform archboot_hypervisor archboot_secure_boot \ +archboot_neovim \ +archboot_platform archboot_hypervisor archboot_secure_boot \ archboot_efivar archboot_lshw archboot_firmware) # COMPRESSION diff --git a/etc/archboot/riscv64-update_installer.conf b/etc/archboot/riscv64-update_installer.conf index fe3d277eb..c03951306 100644 --- a/etc/archboot/riscv64-update_installer.conf +++ b/etc/archboot/riscv64-update_installer.conf @@ -17,8 +17,8 @@ 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 mdadm_udev \ archboot_lvm2 archboot_remote archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils \ -archboot_usbutils archboot_smartmontools archboot_licenses archboot_fsarchiver \ -archboot_neovim archboot_ddrescue \ +archboot_usbutils archboot_smartmontools archboot_licenses \ +archboot_neovim \ archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index 473605d13..18865ec74 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -15,8 +15,8 @@ block archboot_net_common archboot_net keyboard archboot_devicemapper archboot_m mdadm_udev lvm2 archboot_lvm2 encrypt btrfs archboot_filesystems archboot_remote \ archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ -archboot_fsarchiver archboot_neovim \ -archboot_ddrescue archboot_platform archboot_hypervisor archboot_secure_boot \ +archboot_neovim \ +archboot_platform archboot_hypervisor archboot_secure_boot \ archboot_efivar archboot_lshw archboot_firmware) # COMPRESSION diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index e25025596..193eb516f 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -19,8 +19,8 @@ archboot_installer_common archboot_installer archboot_installer_cleanup archboot archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev archboot_lvm2 \ archboot_remote archboot_kexec archboot_grub archboot_refind archboot_efibootmgr \ archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \ -archboot_fsarchiver archboot_neovim archboot_ddrescue \ -archboot_chntpw archboot_secure_boot archboot_efivar archboot_lshw) +archboot_neovim \ +archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index 11f3e882e..b7a96da11 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -16,8 +16,8 @@ archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 encrypt \ btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec \ archboot_grub archboot_refind archboot_efibootmgr archboot_pciutils archboot_usbutils \ archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \ -archboot_fsarchiver archboot_neovim \ -archboot_ddrescue archboot_chntpw \ +archboot_neovim \ +\ archboot_platform archboot_hypervisor archboot_dmidecode \ archboot_secure_boot archboot_efivar archboot_lshw archboot_firmware) diff --git a/usr/lib/initcpio/install/archboot_chntpw b/usr/lib/initcpio/install/archboot_chntpw deleted file mode 100644 index decb44138..000000000 --- a/usr/lib/initcpio/install/archboot_chntpw +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-2.0-only -# Created by Tobias Powalowski - -build () -{ - map add_binary chntpw reged cpnt -} - -help () -{ -cat< - -build () -{ - add_binary "ddrescue" -} - -help () -{ -cat< - -build () -{ - add_binary "fsarchiver" -} - -help () -{ -cat<