mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix iptables conflict
This commit is contained in:
parent
0d6e587cd7
commit
33e347d67a
2 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
# defaults for archboot
|
# defaults for archboot
|
||||||
# packages to install (eg. firmware, kernel packages)
|
# 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 setup
|
||||||
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
_GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
|
||||||
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
_GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
|
||||||
|
|
|
@ -61,8 +61,8 @@ _clean_container() {
|
||||||
if [[ "${_CLEANUP_CONTAINER}" == "1" ]]; then
|
if [[ "${_CLEANUP_CONTAINER}" == "1" ]]; then
|
||||||
echo "Clean container, delete not needed files from ${1} ..."
|
echo "Clean container, delete not needed files from ${1} ..."
|
||||||
rm -r "${1}"/usr/include
|
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/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,xtables}
|
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
|
# 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 {} \;
|
find "${1}"/usr/lib/perl[0-9]* -type f ! -name 'libperl.so' -exec rm -rf {} \;
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue