diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index fa243dcab..11ff82083 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -19,7 +19,7 @@ archboot_wireless_staging archboot_installer_common archboot_installer archboot_ 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_wipe archboot_testdisk archboot_ddrescue \ +archboot_neovim archboot_wipe archboot_ddrescue \ archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index 2efcf1952..e54380286 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -16,7 +16,7 @@ block archboot_net_common archboot_net keyboard dmraid archboot_devicemapper arc 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_wipe archboot_testdisk \ +archboot_fsarchiver archboot_neovim archboot_wipe \ archboot_ddrescue archboot_platform archboot_hypervisor archboot_secure_boot \ archboot_efivar archboot_lshw archboot_firmware) diff --git a/etc/archboot/riscv64-update_installer.conf b/etc/archboot/riscv64-update_installer.conf index 904103f32..74f0671c9 100644 --- a/etc/archboot/riscv64-update_installer.conf +++ b/etc/archboot/riscv64-update_installer.conf @@ -19,7 +19,7 @@ archboot_wireless_staging archboot_installer_common archboot_installer archboot_ 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_wipe archboot_testdisk archboot_ddrescue \ +archboot_neovim archboot_wipe archboot_ddrescue \ archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index f1a78f1eb..974358b44 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -16,7 +16,7 @@ block archboot_net_common archboot_net keyboard dmraid archboot_devicemapper arc 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_wipe archboot_testdisk \ +archboot_fsarchiver archboot_neovim archboot_wipe \ archboot_ddrescue archboot_platform archboot_hypervisor archboot_secure_boot \ archboot_efivar archboot_lshw archboot_firmware) diff --git a/etc/archboot/x86_64-update_installer.conf b/etc/archboot/x86_64-update_installer.conf index 01c5ac9bd..22fbbbcf5 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -20,7 +20,7 @@ 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_wipe archboot_testdisk archboot_ddrescue \ +archboot_fsarchiver archboot_neovim archboot_wipe archboot_ddrescue \ archboot_chntpw archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf index 1846e5701..fe80a872b 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -18,7 +18,7 @@ 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_wipe \ -archboot_testdisk archboot_ddrescue archboot_chntpw \ +archboot_ddrescue archboot_chntpw \ archboot_platform archboot_hypervisor archboot_dmidecode \ archboot_secure_boot archboot_efivar archboot_lshw archboot_firmware) diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh index f23fbce9c..67735f213 100644 --- a/usr/lib/archboot/common.sh +++ b/usr/lib/archboot/common.sh @@ -19,7 +19,7 @@ fi _PACMAN_MIRROR="/etc/pacman.d/mirrorlist" _PACMAN_CONF="/etc/pacman.conf" _CACHEDIR="/var/cache/pacman/pkg" -_FIX_PACKAGES="libelf libevent talloc gdbm gcc-libs perl glibc glib2 harfbuzz nss p11-kit libp11-kit fuse tpm2-tss libsecret libcap libbsd libldap libmd jansson libsasl pcre2 icu libxml2" +_FIX_PACKAGES="libelf libevent talloc gdbm gcc-libs glibc glib2 nss p11-kit libp11-kit tpm2-tss libsecret libcap libbsd libldap libmd jansson libsasl pcre2 icu libxml2" _XORG_PACKAGE="xorg" _VNC_PACKAGE="tigervnc" _WAYLAND_PACKAGE="egl-wayland" diff --git a/usr/lib/initcpio/install/archboot_testdisk b/usr/lib/initcpio/install/archboot_testdisk deleted file mode 100644 index 7b01ce176..000000000 --- a/usr/lib/initcpio/install/archboot_testdisk +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# Created by Tobias Powalowski - -build () -{ - map add_binary testdisk photorec -} - -help () -{ -cat<