From f4c7f67ece79b624af62ffc8fb777954e5592dfd Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 2 Sep 2020 17:13:36 -0400 Subject: [PATCH] cloud: move firewalld remove to package list It works in the package list so let's remove it there so it never gets installed in the first place rather than the dnf erase hack we have now. --- fedora-cloud-base.ks | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 0a7d13f..0f627db 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -67,6 +67,9 @@ kernel-core # rhgb/quiet on kernel command line -plymouth +# No need for firewalld for now. We don't have a firewall on by default. +-firewalld + # noswap on Cloud for now -zram-generator-defaults %end @@ -83,16 +86,6 @@ kernel-core echo "Removing linux-firmware package." rpm -e linux-firmware -# Remove firewalld; was supposed to be optional in F18+, but is pulled in -# in install/image building. -echo "Removing firewalld." -# FIXME! clean_requirements_on_remove is the default with DNF, but may -# not work when package was installed by Anaconda instead of command line. -# Also -- check if this is still even needed with new anaconda -- disabled -# firewall should _not_ pull in this package. -# dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1" -dnf -C -y erase "firewalld*" - echo "Removing random-seed so it's not the same in every image." rm -f /var/lib/systemd/random-seed