put the remove-firewalld code back -- apparently still needed and having it

there is breaking openstack
This commit is contained in:
Matthew Miller 2014-10-02 13:22:33 -04:00
parent 3ae4c4139a
commit 5f0fcd1d5e
2 changed files with 6 additions and 1 deletions

View File

@ -109,6 +109,11 @@ echo .
echo "Removing linux-firmware package."
yum -C -y remove linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is pulled in
# in install/image building.
echo "Removing firewalld."
yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
# Another one needed at install time but not after that, and it pulls
# in some unneeded deps (like, newt and slang)
echo "Removing authconfig."

View File

@ -110,7 +110,7 @@ yum -C -y remove linux-firmware
# Remove firewalld; was supposed to be optional in F18+, but is required to
# be present for install/image building.
echo "Removing firewalld."
yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
# Another one needed at install time but not after that, and it pulls
# in some unneeded deps (like, newt and slang)