From 44dd601bc44460dd4c41b5ec766469e19d66388e Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Jul 11 2014 15:54:19 +0000
Subject: put experimental cloud spin back to same as base cloud spin exept for i18n/docs


---

diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index 9b09185..f6a3bee 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -19,7 +19,6 @@ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,11520
 network --bootproto=dhcp --device=eth0 --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-
 zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
@@ -55,13 +54,13 @@ dracut-config-generic
 
 syslinux-extlinux 
 
+# Needed initially, but removed below.
+firewalld
+
 # cherry-pick a few things from @standard
 tar
 rsync
 
-# anaconda needs authconfig to be installed into the image to setup some things
-authconfig
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
@@ -70,9 +69,7 @@ authconfig
 -kbd
 -uboot-tools
 -kernel
--firewalld
 -grub2
--man-db
 
 %end
 
@@ -119,10 +116,20 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/ 
+echo . 
+
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
 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"
+
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."