From 33e347d67aa98e445af01950f439f828624893de Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 15 Dec 2022 20:41:18 +0100 Subject: [PATCH] fix iptables conflict --- etc/archboot/defaults | 2 +- usr/lib/archboot/container.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/archboot/defaults b/etc/archboot/defaults index dc6c95551..6b04ff8fa 100644 --- a/etc/archboot/defaults +++ b/etc/archboot/defaults @@ -1,6 +1,6 @@ # defaults for archboot # packages to install (eg. firmware, kernel packages) -_PACKAGES="base linux linux-firmware linux-firmware-marvell" +_PACKAGES="base linux linux-firmware linux-firmware-marvell iptables-nft" # grub setup _GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg" _GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png" diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index 02d0b7c55..731c0dafa 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -61,8 +61,8 @@ _clean_container() { if [[ "${_CLEANUP_CONTAINER}" == "1" ]]; then echo "Clean container, delete not needed files from ${1} ..." rm -r "${1}"/usr/include - rm -r "${1}"/usr/share/{aclocal,applications,audit,avahi,awk,bash-completion,common-lisp,dnsmasq,emacs,et,fish,gdb,gettext,gettext-[0-9]*,glib-[0-9]*,gnupg,gtk-doc,iana-etc,icons,icu,iptables,keyutils,libalpm,libgpg-error,makepkg-template,misc,mkinitcpio,ncat,ntp,pixmaps,pkgconfig,readline,screen,smartmontools,ss,tabset,vala,xml,xtables,zoneinfo-leaps,man,doc,info,perl[0-9]*,i18n,locale} - rm -r "${1}"/usr/lib/{audit,avahi,awk,bash,binfmt.d,cifs-utils,cmake,coreutils,cryptsetup,cups,dracut,e2fsprogs,engines-[0-9]*,environment.d,gawk,getconf,gettext,girepository-[0-9]*,glib-[0-9]*,gnupg,gssproxy,guile,icu,krb5,ldb,ldscripts,libnl,ntfs-3g,pkgconfig,python[0-9]*,rsync,samba,sasl2,siconv,tar,terminfo,xfsprogs,xtables} + rm -r "${1}"/usr/share/{aclocal,applications,audit,avahi,awk,bash-completion,common-lisp,emacs,et,fish,gdb,gettext,gettext-[0-9]*,glib-[0-9]*,gnupg,gtk-doc,iana-etc,icons,icu,keyutils,libalpm,libgpg-error,makepkg-template,misc,mkinitcpio,ncat,ntp,pixmaps,pkgconfig,readline,screen,smartmontools,ss,tabset,vala,xml,zoneinfo-leaps,man,doc,info,perl[0-9]*,i18n,locale} + rm -r "${1}"/usr/lib/{audit,avahi,awk,bash,binfmt.d,cifs-utils,cmake,coreutils,cryptsetup,cups,dracut,e2fsprogs,engines-[0-9]*,environment.d,gawk,getconf,gettext,girepository-[0-9]*,glib-[0-9]*,gnupg,gssproxy,guile,icu,krb5,ldb,ldscripts,libnl,ntfs-3g,pkgconfig,python[0-9]*,rsync,samba,sasl2,siconv,tar,terminfo,xfsprogs} # until vim is fixed, clean all files and leave libperl.so find "${1}"/usr/lib/perl[0-9]* -type f ! -name 'libperl.so' -exec rm -rf {} \; fi