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.
This commit is contained in:
Dusty Mabe 2020-09-02 17:13:36 -04:00
parent 4a6850e465
commit f4c7f67ece
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671

View File

@ -67,6 +67,9 @@ kernel-core
# rhgb/quiet on kernel command line # rhgb/quiet on kernel command line
-plymouth -plymouth
# No need for firewalld for now. We don't have a firewall on by default.
-firewalld
# noswap on Cloud for now # noswap on Cloud for now
-zram-generator-defaults -zram-generator-defaults
%end %end
@ -83,16 +86,6 @@ kernel-core
echo "Removing linux-firmware package." echo "Removing linux-firmware package."
rpm -e linux-firmware 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." echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/systemd/random-seed rm -f /var/lib/systemd/random-seed