From cbc7b3aa24a4d1678d1388db94060233d35920d6 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Fri, 14 Jan 2022 14:45:36 +0100
Subject: [PATCH] remove iptables, is not really necessary to have it on
 install/rescue media

---
 etc/archboot/aarch64.conf                  |  2 +-
 etc/archboot/x86_64.conf                   |  2 +-
 usr/lib/initcpio/install/archboot_iptables | 39 ----------------------
 usr/lib/initcpio/install/archboot_lftp     | 16 ---------
 4 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 usr/lib/initcpio/install/archboot_iptables
 delete mode 100644 usr/lib/initcpio/install/archboot_lftp

diff --git a/etc/archboot/aarch64.conf b/etc/archboot/aarch64.conf
index 4ae699ea0..d0e239a31 100644
--- a/etc/archboot/aarch64.conf
+++ b/etc/archboot/aarch64.conf
@@ -15,7 +15,7 @@ archboot_acpi archboot_motd \
 archboot_hwdetect block archboot_net  \
 keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \
 encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
-archboot_pppoe archboot_grub archboot_efibootmgr archboot_iptables archboot_pciutils archboot_usbutils \
+archboot_pppoe archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \
 archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
 archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
 archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
diff --git a/etc/archboot/x86_64.conf b/etc/archboot/x86_64.conf
index 58e6c5ea1..30c675343 100644
--- a/etc/archboot/x86_64.conf
+++ b/etc/archboot/x86_64.conf
@@ -15,7 +15,7 @@ archboot_acpi archboot_motd archboot_memtest archboot_intel_wireless \
 archboot_hwdetect block memdisk archboot_pcspkr archboot_net  \
 keyboard dmraid archboot_devicemapper archboot_mdadm mdadm_udev lvm2 archboot_lvm2 \
 encrypt btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec archboot_ppp archboot_xl2tpd \
-archboot_pppoe archboot_grub archboot_refind archboot_efibootmgr archboot_syslinux archboot_iptables archboot_pciutils archboot_usbutils \
+archboot_pppoe archboot_grub archboot_refind archboot_efibootmgr archboot_syslinux archboot_pciutils archboot_usbutils \
 archboot_openvpn archboot_vpnc archboot_pptpclient archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
 archboot_linux_atm archboot_netctl archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
 archboot_chntpw archboot_nmap archboot_tcpdump archboot_openconnect archboot_dnsmasq archboot_platform \
diff --git a/usr/lib/initcpio/install/archboot_iptables b/usr/lib/initcpio/install/archboot_iptables
deleted file mode 100644
index 84e9be562..000000000
--- a/usr/lib/initcpio/install/archboot_iptables
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-build ()
-{
-    add_checked_modules '/net/ipv6|/net/ipv4|/net/netfilter|/net/bridge/'
-    apps="nft xtables-nft-multi xtables-legacy-multi nfnl_osf nfbpf_compile"
-    for i in $apps; do
-        add_binary "$i"
-    done
-  symlinks="/usr/bin/arptables /usr/bin/arptables-nft /usr/bin/arptables-nft-restore \
-            /usr/bin/arptables-nft-save /usr/bin/arptables-restore /usr/bin/arptables-save \
-            /usr/bin/ebtables /usr/bin/ebtables-nft /usr/bin/ebtables-nft-restore \
-            /usr/bin/ebtables-nft-save /usr/bin/ebtables-restore /usr/bin/ebtables-save \
-            /usr/bin/ip6tables /usr/bin/ip6tables-apply /usr/bin/ip6tables-legacy \
-            /usr/bin/ip6tables-legacy-restore /usr/bin/ip6tables-legacy-save \
-            /usr/bin/ip6tables-nft /usr/bin/ip6tables-nft-restore /usr/bin/ip6tables-nft-save \
-            /usr/bin/ip6tables-restore /usr/bin/ip6tables-restore-translate /usr/bin/ip6tables-save \
-            /usr/bin/ip6tables-translate /usr/bin/iptables /usr/bin/iptables-apply \
-            /usr/bin/iptables-legacy /usr/bin/iptables-legacy-restore /usr/bin/iptables-legacy-save \
-            /usr/bin/iptables-nft /usr/bin/iptables-nft-restore /usr/bin/iptables-nft-save \
-            /usr/bin/iptables-restore /usr/bin/iptables-restore-translate /usr/bin/iptables-save \
-            /usr/bin/iptables-translate /usr/bin/iptables-xml /usr/bin/xtables-monitor"
-    for i in $symlinks; do
-        add_binary "$(which $(basename $(readlink "$i")))"
-        add_symlink "$i" "$(which $(basename $(readlink "$i")))"
-    done
-    add_file "/etc/arptables.conf"
-    add_file "/etc/ebtables.conf"
-    add_file "/etc/ethertypes"
-    add_dir "/etc/iptables/"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes iptables on an archboot image.
-HELPEOF
-} 
diff --git a/usr/lib/initcpio/install/archboot_lftp b/usr/lib/initcpio/install/archboot_lftp
deleted file mode 100644
index 3dfb933a0..000000000
--- a/usr/lib/initcpio/install/archboot_lftp
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-
-build ()
-{
-    add_binary "lftp"
-    add_binary "lftpget"
-    add_file "/etc/lftp.conf"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook includes lftp on an archboot image.
-HELPEOF
-}