From af357b414e8c11c5ffeedcb64b2806042b21e35f Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 15 Dec 2022 22:04:08 +0100 Subject: [PATCH] remove dnsmasq, iptables-nft, nftables, nmap and tcpdump --- etc/archboot/aarch64-update_installer.conf | 4 ++-- etc/archboot/aarch64.conf | 3 +-- etc/archboot/riscv64-update_installer.conf | 4 ++-- etc/archboot/riscv64.conf | 3 +-- etc/archboot/x86_64-update_installer.conf | 3 +-- etc/archboot/x86_64.conf | 4 ++-- usr/lib/initcpio/install/archboot_dnsmasq | 16 ---------------- usr/lib/initcpio/install/archboot_net | 12 ------------ 8 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 usr/lib/initcpio/install/archboot_dnsmasq diff --git a/etc/archboot/aarch64-update_installer.conf b/etc/archboot/aarch64-update_installer.conf index 04e826156..a97910a73 100644 --- a/etc/archboot/aarch64-update_installer.conf +++ b/etc/archboot/aarch64-update_installer.conf @@ -19,8 +19,8 @@ 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_vim archboot_wipe archboot_testdisk archboot_ddrescue archboot_nmap \ -archboot_tcpdump archboot_dnsmasq archboot_secure_boot archboot_efivar archboot_lshw) +archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \ +archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf index 943cac13a..5de1798c2 100644 --- a/etc/archboot/aarch64.conf +++ b/etc/archboot/aarch64.conf @@ -17,8 +17,7 @@ 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_vim archboot_wipe archboot_testdisk \ -archboot_ddrescue archboot_nmap archboot_tcpdump archboot_dnsmasq \ -archboot_platform archboot_hypervisor archboot_secure_boot \ +archboot_ddrescue 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 e40f9b1ff..66945ac3f 100644 --- a/etc/archboot/riscv64-update_installer.conf +++ b/etc/archboot/riscv64-update_installer.conf @@ -19,8 +19,8 @@ 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_vim archboot_wipe archboot_testdisk archboot_ddrescue archboot_nmap \ -archboot_tcpdump archboot_dnsmasq archboot_secure_boot archboot_efivar archboot_lshw) +archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \ +archboot_secure_boot archboot_efivar archboot_lshw) # COMPRESSION # Use this to compress the initramfs image. By default, gzip compression diff --git a/etc/archboot/riscv64.conf b/etc/archboot/riscv64.conf index dfc116bd9..fe7cfd43b 100644 --- a/etc/archboot/riscv64.conf +++ b/etc/archboot/riscv64.conf @@ -17,8 +17,7 @@ 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_vim archboot_wipe archboot_testdisk \ -archboot_ddrescue archboot_nmap archboot_tcpdump archboot_dnsmasq \ -archboot_platform archboot_hypervisor archboot_secure_boot \ +archboot_ddrescue 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 6f1634454..46cb8cf72 100644 --- a/etc/archboot/x86_64-update_installer.conf +++ b/etc/archboot/x86_64-update_installer.conf @@ -21,8 +21,7 @@ archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev archbo archboot_remote archboot_kexec archboot_grub archboot_refind archboot_efibootmgr \ archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \ archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \ -archboot_chntpw archboot_nmap archboot_tcpdump archboot_dnsmasq \ -archboot_secure_boot archboot_efivar archboot_lshw) +archboot_chntpw 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 8d0b613d5..8eae5bdff 100644 --- a/etc/archboot/x86_64.conf +++ b/etc/archboot/x86_64.conf @@ -18,8 +18,8 @@ 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_vim archboot_wipe \ -archboot_testdisk archboot_ddrescue archboot_chntpw archboot_nmap archboot_tcpdump \ -archboot_dnsmasq archboot_platform archboot_hypervisor archboot_dmidecode \ +archboot_testdisk archboot_ddrescue archboot_chntpw \ +archboot_platform archboot_hypervisor archboot_dmidecode \ archboot_secure_boot archboot_efivar archboot_lshw archboot_firmware) # COMPRESSION diff --git a/usr/lib/initcpio/install/archboot_dnsmasq b/usr/lib/initcpio/install/archboot_dnsmasq deleted file mode 100644 index 501574647..000000000 --- a/usr/lib/initcpio/install/archboot_dnsmasq +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -# Created by Tobias Powalowski - -build () -{ - map add_binary dnsmasq dhcp_lease_time dhcp_release dhcp_release6 - add_file "/etc/dnsmasq.conf" - map add_dir "/var/db" "/var/lib/misc" -} - -help () -{ -cat<