From 5f0fcd1d5ed06bc60674c48714fe41a69716d4c5 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 2 Oct 2014 13:22:33 -0400 Subject: [PATCH] put the remove-firewalld code back -- apparently still needed and having it there is breaking openstack --- fedora-cloud-base.ks | 5 +++++ fedora-cloud-experimental.ks | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 646e93c..6a5a1de 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -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." diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks index e181d67..b865c4c 100644 --- a/fedora-cloud-experimental.ks +++ b/fedora-cloud-experimental.ks @@ -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)