From a2c00b60b41242c4e67514e0fe5e78d8694a8378 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 6 Feb 2023 08:23:49 +0100 Subject: [PATCH] move wipe to archboot_base --- etc/archboot/aarch64-update_installer.conf | 2 +- etc/archboot/aarch64.conf | 2 +- etc/archboot/riscv64-update_installer.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_base | 2 +- usr/lib/initcpio/install/archboot_base_cleanup | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index cd8337955..cb4c4ba86 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_ddrescue \ +archboot_neovim archboot_ddrescue \ archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index 5539f2444..556784ee0 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -15,7 +15,7 @@ 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_wipe \ +archboot_fsarchiver archboot_neovim \ 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 e6ed3692a..fe3d277eb 100644 --- a/etc/archboot/riscv64-update_installer.conf +++ b/etc/archboot/riscv64-update_installer.conf @@ -18,7 +18,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_ddrescue \ +archboot_neovim archboot_ddrescue \ archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index 3f7e03c61..473605d13 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -15,7 +15,7 @@ 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_wipe \ +archboot_fsarchiver archboot_neovim \ 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 aa29c4828..e25025596 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -19,7 +19,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_ddrescue \ +archboot_fsarchiver archboot_neovim 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 88e06a4e3..11f3e882e 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -16,7 +16,7 @@ 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_wipe \ +archboot_fsarchiver archboot_neovim \ archboot_ddrescue archboot_chntpw \ archboot_platform archboot_hypervisor archboot_dmidecode \ archboot_secure_boot archboot_efivar archboot_lshw archboot_firmware) diff --git a/usr/lib/initcpio/install/archboot_base b/usr/lib/initcpio/install/archboot_base index bcd2ab50d..fd373c819 100644 --- a/usr/lib/initcpio/install/archboot_base +++ b/usr/lib/initcpio/install/archboot_base @@ -27,7 +27,7 @@ build () tsort unexpand unlink users vdir pwait fuser prtstat pslog pstree newgidmap newuidmap \ lzmainfo xzcmp xzgrep xzegrep xzfgrep gzexe uncompress zcmp zdiff zegrep zfgrep zforce zmore znew \ bunzip2 bzcat bzdiff bzgrep bzip2recover bzmore chacl getfacl setfacl attr getfattr \ - setfattr pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 gunzip zcat + setfattr pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 gunzip zcat wipe [[ "$(uname -m)" == "x86_64" ]] && map add_binary i386 x86_64 peekfd [[ "$(uname -m)" == "aarch64" ]] && add_binary peekfd diff --git a/usr/lib/initcpio/install/archboot_base_cleanup b/usr/lib/initcpio/install/archboot_base_cleanup index ffb5415d1..d71a05c5f 100644 --- a/usr/lib/initcpio/install/archboot_base_cleanup +++ b/usr/lib/initcpio/install/archboot_base_cleanup @@ -27,7 +27,7 @@ build () unexpand unlink users vdir pwait fuser prtstat pslog pstree newgidmap newuidmap \ lzmainfo xzcmp gzexe uncompress zcmp zdiff zegrep zfgrep zforce zmore znew \ bzdiff bzgrep bzip2recover bzmore chacl getfacl setfacl attr getfattr \ - setfattr pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 gunzip zcat" + setfattr pzstd unzstd zstdcat zstdgrep zstdless zstdmt lz4 lz4c lz4cat unlz4 gunzip zcat wipe" if [[ "$(uname -m)" == "x86_64" ]]; then apps="i386 x86_64 peekfd $apps" fi