mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
remove dnsmasq, iptables-nft, nftables, nmap and tcpdump
This commit is contained in:
parent
33e347d67a
commit
af357b414e
8 changed files with 9 additions and 40 deletions
|
@ -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_tz archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev \
|
||||||
archboot_lvm2 archboot_remote archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils \
|
archboot_lvm2 archboot_remote archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils \
|
||||||
archboot_usbutils archboot_smartmontools archboot_licenses archboot_fsarchiver \
|
archboot_usbutils archboot_smartmontools archboot_licenses archboot_fsarchiver \
|
||||||
archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue archboot_nmap \
|
archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
|
||||||
archboot_tcpdump archboot_dnsmasq archboot_secure_boot archboot_efivar archboot_lshw)
|
archboot_secure_boot archboot_efivar archboot_lshw)
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
# Use this to compress the initramfs image. By default, gzip compression
|
# Use this to compress the initramfs image. By default, gzip compression
|
||||||
|
|
|
@ -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_kexec archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \
|
||||||
archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
||||||
archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk \
|
archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk \
|
||||||
archboot_ddrescue archboot_nmap archboot_tcpdump archboot_dnsmasq \
|
archboot_ddrescue archboot_platform archboot_hypervisor archboot_secure_boot \
|
||||||
archboot_platform archboot_hypervisor archboot_secure_boot \
|
|
||||||
archboot_efivar archboot_lshw archboot_firmware)
|
archboot_efivar archboot_lshw archboot_firmware)
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
|
|
|
@ -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_tz archboot_keymap archboot_motd archboot_hwdetect archboot_mdadm mdadm_udev \
|
||||||
archboot_lvm2 archboot_remote archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils \
|
archboot_lvm2 archboot_remote archboot_kexec archboot_grub archboot_efibootmgr archboot_pciutils \
|
||||||
archboot_usbutils archboot_smartmontools archboot_licenses archboot_fsarchiver \
|
archboot_usbutils archboot_smartmontools archboot_licenses archboot_fsarchiver \
|
||||||
archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue archboot_nmap \
|
archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
|
||||||
archboot_tcpdump archboot_dnsmasq archboot_secure_boot archboot_efivar archboot_lshw)
|
archboot_secure_boot archboot_efivar archboot_lshw)
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
# Use this to compress the initramfs image. By default, gzip compression
|
# Use this to compress the initramfs image. By default, gzip compression
|
||||||
|
|
|
@ -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_kexec archboot_grub archboot_efibootmgr archboot_pciutils archboot_usbutils \
|
||||||
archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
||||||
archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk \
|
archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk \
|
||||||
archboot_ddrescue archboot_nmap archboot_tcpdump archboot_dnsmasq \
|
archboot_ddrescue archboot_platform archboot_hypervisor archboot_secure_boot \
|
||||||
archboot_platform archboot_hypervisor archboot_secure_boot \
|
|
||||||
archboot_efivar archboot_lshw archboot_firmware)
|
archboot_efivar archboot_lshw archboot_firmware)
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
|
|
|
@ -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_remote archboot_kexec archboot_grub archboot_refind archboot_efibootmgr \
|
||||||
archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \
|
archboot_pciutils archboot_usbutils archboot_smartmontools archboot_licenses \
|
||||||
archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
|
archboot_fsarchiver archboot_vim archboot_wipe archboot_testdisk archboot_ddrescue \
|
||||||
archboot_chntpw archboot_nmap archboot_tcpdump archboot_dnsmasq \
|
archboot_chntpw archboot_secure_boot archboot_efivar archboot_lshw)
|
||||||
archboot_secure_boot archboot_efivar archboot_lshw)
|
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
# Use this to compress the initramfs image. By default, gzip compression
|
# Use this to compress the initramfs image. By default, gzip compression
|
||||||
|
|
|
@ -18,8 +18,8 @@ btrfs archboot_filesystems archboot_remote archboot_cpufreq archboot_kexec \
|
||||||
archboot_grub archboot_refind archboot_efibootmgr archboot_pciutils archboot_usbutils \
|
archboot_grub archboot_refind archboot_efibootmgr archboot_pciutils archboot_usbutils \
|
||||||
archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
archboot_smartmontools archboot_licenses archboot_wireless archboot_wireless_staging \
|
||||||
archboot_fsarchiver archboot_vim archboot_wipe \
|
archboot_fsarchiver archboot_vim archboot_wipe \
|
||||||
archboot_testdisk archboot_ddrescue archboot_chntpw archboot_nmap archboot_tcpdump \
|
archboot_testdisk archboot_ddrescue archboot_chntpw \
|
||||||
archboot_dnsmasq archboot_platform archboot_hypervisor archboot_dmidecode \
|
archboot_platform archboot_hypervisor archboot_dmidecode \
|
||||||
archboot_secure_boot archboot_efivar archboot_lshw archboot_firmware)
|
archboot_secure_boot archboot_efivar archboot_lshw archboot_firmware)
|
||||||
|
|
||||||
# COMPRESSION
|
# COMPRESSION
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Created by Tobias Powalowski <tpowa@archlinux.org>
|
|
||||||
|
|
||||||
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<<HELPEOF
|
|
||||||
This hook includes dnsmasq on an archboot image.
|
|
||||||
HELPEOF
|
|
||||||
}
|
|
|
@ -3,23 +3,11 @@
|
||||||
|
|
||||||
build ()
|
build ()
|
||||||
{
|
{
|
||||||
add_checked_modules '/netfilter/'
|
|
||||||
map add_binary traceroute arping clockdiff tracepath ssh arpd genl \
|
map add_binary traceroute arping clockdiff tracepath ssh arpd genl \
|
||||||
ifstat ctstat rtstat lnstat nstat rtacct rtmon ss tc bridge \
|
ifstat ctstat rtstat lnstat nstat rtacct rtmon ss tc bridge \
|
||||||
dcb devlink rdma tipc vdpa ethtool elinks weechat brctl
|
dcb devlink rdma tipc vdpa ethtool elinks weechat brctl
|
||||||
# add iproute 2, add openssl helper libraries
|
# add iproute 2, add openssl helper libraries
|
||||||
map add_full_dir "/usr/lib/tc" "/usr/share/tc" "/etc/iproute2" "/usr/lib/engines"
|
map add_full_dir "/usr/lib/tc" "/usr/share/tc" "/etc/iproute2" "/usr/lib/engines"
|
||||||
# add iptables and nftables
|
|
||||||
map add_file /etc/arptables.conf /etc/ebtables.conf /etc/ethertypes /etc/nftables.conf
|
|
||||||
map add_full_dir /etc/iptables /usr/lib/xtables /usr/share/iptables /usr/share/xtables /usr/share/nftables
|
|
||||||
map add_binary arptables arptables-nft arptables-nft-restore arptables-nft-save arptables-restore \
|
|
||||||
arptables-save ebtables ebtables-nft ebtables-nft-restore ebtables-nft-save ebtables-restore ebtables-save \
|
|
||||||
ip6tables ip6tables-apply ip6tables-legacy ip6tables-legacy-restore ip6tables-legacy-save ip6tables-nft \
|
|
||||||
ip6tables-nft-restore ip6tables-nft-save ip6tables-restore ip6tables-restore-translate ip6tables-save \
|
|
||||||
ip6tables-translate iptables iptables-apply iptables-legacy iptables-legacy-restore \
|
|
||||||
iptables-legacy-save iptables-nft iptables-nft-restore iptables-nft-save iptables-restore \
|
|
||||||
iptables-restore-translate iptables-save iptables-translate iptables-xml nfbpf_compile nfnl_osf \
|
|
||||||
xtables-legacy-multi xtables-monitor xtables-nft-multi nft
|
|
||||||
# add dnssec-anchors
|
# add dnssec-anchors
|
||||||
add_file "/etc/trusted-key.key"
|
add_file "/etc/trusted-key.key"
|
||||||
# add weechat plugins and defaults
|
# add weechat plugins and defaults
|
||||||
|
|
Loading…
Reference in a new issue