From 179958d8c9ebdf8ed45f7df52342a16452bf12ec Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Jan 09 2018 19:58:54 +0000
Subject: manifest: include firewalld in Atomic Host


We want to include it to ease the lives of some ops guys/gals who want
to use it and don't want to jump through hoops to get it.

See https://pagure.io/atomic-wg/issue/372

---

diff --git a/fedora-atomic-host.json b/fedora-atomic-host.json
index ca9c9de..25de946 100644
--- a/fedora-atomic-host.json
+++ b/fedora-atomic-host.json
@@ -88,7 +88,7 @@
          "which",
          "nfs-utils",
          "curl",
-         "iptables-services", "iptables",
+         "iptables-services", "iptables", "firewalld",
          "NetworkManager",
          "dnsmasq",
          "hostname", "initscripts", "iproute", "iputils", "less",
diff --git a/treecompose-post.sh b/treecompose-post.sh
index 81d6c5e..3658863 100755
--- a/treecompose-post.sh
+++ b/treecompose-post.sh
@@ -18,3 +18,7 @@ for x in /usr/sbin/glibc_post_upgrade.*; do
         ln -srf /usr/bin/true ${x}
     fi
 done
+
+# Disable firewalld - we include it but don't want it enabled by default
+# See https://pagure.io/atomic-wg/issue/372
+systemctl disable firewalld