From 0f3d0b84266c87babb90678888639ec9f1cf73b4 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Jan 11 2018 22:46:11 +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

(cherry picked from commit 179958d8c9ebdf8ed45f7df52342a16452bf12ec)

---

diff --git a/fedora-atomic-host-base.json b/fedora-atomic-host-base.json
index 3cb7373..6d7b311 100644
--- a/fedora-atomic-host-base.json
+++ b/fedora-atomic-host-base.json
@@ -86,7 +86,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 f1f23d0..4eaaed6 100755
--- a/treecompose-post.sh
+++ b/treecompose-post.sh
@@ -8,3 +8,7 @@ if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
     (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
     mv /etc/systemd.journald.conf{.new,}
 fi
+
+# Disable firewalld - we include it but don't want it enabled by default
+# See https://pagure.io/atomic-wg/issue/372
+systemctl disable firewalld