From b5c6a9265b1d06ff86c4aba8a4ab545b88727537 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Fri, 11 Jul 2014 11:01:56 -0400
Subject: [PATCH 01/60] fedora-release-cloud in cloud images

---
 fedora-cloud-atomic.ks       | 5 +++++
 fedora-cloud-base.ks         | 3 +++
 fedora-cloud-bigdata.ks      | 3 +++
 fedora-cloud-experimental.ks | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 87d6194..7c01390 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -32,10 +32,15 @@ reboot
 
 # Package list.
 %packages
+
+fedora-release-cloud
+
 kernel-core
 @core
 grubby
 
+
+
 # cloud-init does magical things with EC2 metadata, including provisioning
 # a user account with ssh keys.
 cloud-init
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 5d6e6a6..bea106a 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -39,6 +39,9 @@ reboot
 
 # Package list.
 %packages
+
+fedora-release-cloud
+
 kernel-core
 @core
 grubby
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index a76761e..5d41dc8 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -39,6 +39,9 @@ reboot
 
 # Package list.
 %packages
+
+fedora-release-cloud
+
 kernel-core
 @core
 grubby
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index a80b187..9b09185 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -31,6 +31,9 @@ reboot
 
 # Package list.
 %packages --excludedocs --instLangs=en_US
+
+fedora-release-cloud
+
 kernel-core
 @core
 grubby

From 44dd601bc44460dd4c41b5ec766469e19d66388e Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Fri, 11 Jul 2014 11:54:19 -0400
Subject: [PATCH 02/60] put experimental cloud spin back to same as base cloud
 spin exept for i18n/docs

---
 fedora-cloud-experimental.ks | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

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."

From 2fa7a61c8e3a7202bef25714230a61cab898040b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 16 Jul 2014 10:28:48 +0100
Subject: [PATCH 03/60] remove growroot in arm images to test 1109603

---
 fedora-arm-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index 15f3cc7..fb25a7f 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -34,7 +34,7 @@ extlinux-bootloader
 initial-setup
 initial-setup-gui
 #lets resize / on first boot
-dracut-modules-growroot
+# dracut-modules-growroot
 
 # remove this in %post
 dracut-config-generic

From b73614d1e19f75e189b9f90e90e596b19d3b9314 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 21 Jul 2014 14:06:35 -0400
Subject: [PATCH 04/60] atomic: Use ostreesetup instead of %repo

Since we're doing an OSTree install
---
 fedora-cloud-atomic.ks | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 7c01390..5abde76 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -25,8 +25,8 @@ zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
 
-%include fedora-repo.ks
-
+# Equivalent of %include fedora-repo.ks
+ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="http://dl.fedoraproject.org/repo" --nogpg
 
 reboot
 

From 04ec88194acda21444f61e8399ba31941c928ebd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 21 Jul 2014 14:07:03 -0400
Subject: [PATCH 05/60] atomic: Drop %packages section

Not relevant when doing an OSTree install.
---
 fedora-cloud-atomic.ks | 49 ------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 5abde76..59dd910 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -30,55 +30,6 @@ ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="http://dl.f
 
 reboot
 
-# Package list.
-%packages
-
-fedora-release-cloud
-
-kernel-core
-@core
-grubby
-
-
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
--dracut-config-rescue
-
-syslinux-extlinux 
-
-# Needed initially, but removed below.
-firewalld
-
-# cherry-pick a few things from @standard
-tar
-rsync
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--NetworkManager
--iprutils
--kbd
--uboot-tools
--kernel
--grub2
-
-%end
-
-
-
 %post --erroronfail
 
 # Create grub.conf for EC2. This used to be done by appliance creator but

From e8ca9581eb82684566a0256006914e04ed2155b2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 21 Jul 2014 14:07:32 -0400
Subject: [PATCH 06/60] atomic: Strip GRUB1/EC2 bits

These don't work, because OSTree doesn't understand GRUB1 config
files.  We should focus on HVM.
---
 fedora-cloud-atomic.ks | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 59dd910..3b8816e 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -32,29 +32,6 @@ reboot
 
 %post --erroronfail
 
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
-  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
-  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
-  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
-  echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root

From ceba259b5abaa334128ff57a1268c70bec20679e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 21 Jul 2014 14:08:22 -0400
Subject: [PATCH 07/60] atomic: default.target is set in the tree

The compose process sets it.
---
 fedora-cloud-atomic.ks | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 3b8816e..77a6f6b 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -42,12 +42,6 @@ userdel -r none
 # 0 means wait forever, so instead we'll go with 1.
 sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
 
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-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/ 

From 56085be1db4721ddbf94e7f766f9389e69060c99 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 21 Jul 2014 14:08:46 -0400
Subject: [PATCH 08/60] atomic: No need to strip out packages post-install

Anaconda doesn't require firewalld at least anymore, and in any case
we can't strip packages from the tree.
---
 fedora-cloud-atomic.ks | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 77a6f6b..8dd6e35 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -47,20 +47,6 @@ 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."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
-
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
 # actually have the opportunity to login there. FIX.

From 7d8b302b9fa02e5a83b51140746361aa54693f5b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 21 Jul 2014 14:09:24 -0400
Subject: [PATCH 09/60] atomic: Remove %post which calls fixfiles

This should be handled correctly at installation time.  If it's not, I
think what we really want is a %post --relabel or something option to
have Anaconda take care of this.
---
 fedora-cloud-atomic.ks | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 8dd6e35..19c1bcc 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -121,15 +121,6 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
-
-echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
-
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :

From bc28d4e2722e33d015cf59d6918f50a7c9f7a36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Mon, 21 Jul 2014 17:29:16 +0200
Subject: [PATCH 10/60] Server: Use server-product-environment by default

Most importantly, cause fedora-release-server to be installed.
---
 fedora-install-server.ks | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/fedora-install-server.ks b/fedora-install-server.ks
index 8b1854f..f469139 100644
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -68,13 +68,21 @@ dracut-*
 @multimedia
 @hardware-support
 
-# Workstation
+# Some development tools
 @development-libs
 @development-tools
 @c-development
 @rpm-development-tools
 @fedora-packager
 
+# Fedora Server.
+# Including this causes the fedora-release-server package to be included,
+# which in turn enables server-product-environment, and due to to its priority
+# this will be the default environment.
+@server-product
+@headless-management
+@container-management
+
 # Common server packages
 @mysql
 @sql-server
@@ -103,8 +111,6 @@ dracut-*
 @load-balancer
 @ha
 
-@container-management
-@headless-management
 @javaenterprise
 
 # “uservisible” groups we want to offer

From 022cc883c056e16c5baa7ecf54ed60454c67bce3 Mon Sep 17 00:00:00 2001
From: Vaclav Pavlin <vpavlin@redhat.com>
Date: Tue, 29 Jul 2014 14:30:03 +0200
Subject: [PATCH 11/60] Add kickstart for Docker base image

---
 fedora-docker-base.ks | 49 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 fedora-docker-base.ks

diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
new file mode 100644
index 0000000..9af8798
--- /dev/null
+++ b/fedora-docker-base.ks
@@ -0,0 +1,49 @@
+# This is a minimal Fedora install designed to serve as a Docker base image. 
+#
+# To keep this image minimal it only installs English language. You need to change
+# yum configuration in order to enable other languages.
+
+
+bootloader --disable
+timezone America/New_York --isUtc --nontp
+rootpw --plaintext qweqwe
+
+keyboard us
+firewall --disable
+zerombr
+clearpart --all
+part / --size 4096 --fstype ext4
+reboot
+
+%packages --excludedocs --instLangs=en --nocore
+bash
+fedora-release
+vim-minimal
+yum
+#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
+-kernel
+
+
+%end
+
+%post --log=/tmp/anaconda-post.log
+# Set the language rpm nodocs transaction flag persistently in the
+# image yum.conf and rpm macros
+
+LANG="en_US"
+echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
+
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+rm -f /usr/lib/locale/locale-archive
+rm -rf /var/cache/yum/*
+rm -f /tmp/ks-script*
+
+%end

From 8180b563f16b9e01af52ab935f40e0b8dbee0440 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 30 Jul 2014 02:23:41 -0500
Subject: [PATCH 12/60] fix up the options to the bootloader config, make the
 rootfs smaller.

---
 fedora-docker-base.ks | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 9af8798..1a335d3 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -4,7 +4,7 @@
 # yum configuration in order to enable other languages.
 
 
-bootloader --disable
+bootloader --location=none
 timezone America/New_York --isUtc --nontp
 rootpw --plaintext qweqwe
 
@@ -12,7 +12,7 @@ keyboard us
 firewall --disable
 zerombr
 clearpart --all
-part / --size 4096 --fstype ext4
+part / --size 3000 --fstype ext4
 reboot
 
 %packages --excludedocs --instLangs=en --nocore

From b0850152d822d36b9cbf2089beb9c432112cf286 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 1 Aug 2014 12:05:44 -0500
Subject: [PATCH 13/60] license files have moved, and we no longer ship the
 collection as GPL but MIT

---
 fedora-live-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 54197df..15db01a 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -303,7 +303,7 @@ rm -f /core*
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then

From a493743f9e6e9e7304d9fc094a3afa58d600ff71 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 12 Aug 2014 12:37:11 +0200
Subject: [PATCH 14/60] workstation: Install workstation firewalld config

So that we use our workstation specific firewall:
http://www.hadess.net/2014/06/firewalls-and-per-network-sharing.html
---
 fedora-workstation-packages.ks | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index 341d330..0599db7 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -4,6 +4,9 @@
 @libreoffice
 @networkmanager-submodules
 
+# Workstation specific package
+firewalld-config-workstation
+
 #QT
 qt
 qt-settings

From 5c326c797b8f0842b6dc04412d5f9820d92a9026 Mon Sep 17 00:00:00 2001
From: Elad Alfassa <elad@fedoraproject.org>
Date: Tue, 19 Aug 2014 11:30:21 +0300
Subject: [PATCH 15/60] workstation: Don't install icedtea-web by default

icedtea-web clutters the application view with two launchers for config
dialogs which are not really apps as we define the term.

It used to be excluded previously but accidentally slipped back in with
the live-desktop -> live-workstation kickstart renames; this commit
takes it out again.

https://bugzilla.redhat.com/show_bug.cgi?id=1131248
---
 fedora-workstation-packages.ks | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index 0599db7..a8a0ffa 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -50,6 +50,7 @@ nss-mdns
 -gtk3-immodule-xim
 -gtkmm24
 -guile
+-icedtea-web
 -imsettings*
 -irda-utils
 -irqbalance

From 89a63ee25a743ae3e88606c52d7d501dfeb72cd2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 21 Aug 2014 18:24:00 -0400
Subject: [PATCH 16/60] atomic: Switch to autopart

We actually want LVM for atomic by default, since it allows a lot more
storage flexibility.
---
 fedora-cloud-atomic.ks | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 19c1bcc..1b628ce 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -23,7 +23,8 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+# Atomic differs from cloud - we want LVM
+autopart
 
 # Equivalent of %include fedora-repo.ks
 ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="http://dl.fedoraproject.org/repo" --nogpg

From 2b64928357be251924bf371b08aee87f2b78964f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 23 Aug 2014 11:08:01 -0600
Subject: [PATCH 17/60] First cut at reducing size of Xfce spin this cycle.

---
 fedora-xfce-packages.ks | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks
index 71e253f..f9ffa8d 100644
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -37,6 +37,10 @@ gnome-keyring-pam
 -ibus-typing-booster
 -xfce4-sensors-plugin
 #-man-pages-*
+-adobe-source-han-* # save 94MB
+-rodent-icon-theme  # save 34MB
+-skkdic             # save 25MB
+-naver-nanum-gothic-fonts # save 14MB
 
 # drop some system-config things
 -system-config-network

From cf21afd8b0b375f8ebcfb44de929cce213a1f633 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@kwetu.telus1603>
Date: Sat, 23 Aug 2014 11:13:15 -0700
Subject: [PATCH 18/60] design-suite: add gmic

---
 fedora-live-design-suite.ks | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index c39da21..b690bd1 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -25,6 +25,7 @@ entangle
 fontforge
 font-manager 
 gimp
+gimp-elsamuko
 gimp-*-plugin
 gimp-data-extras
 gimp-gap
@@ -34,7 +35,7 @@ gimp-normalmap
 gimp-resynthesizer
 gimp-separate+
 gpick
-GREYCstoration-gimp 
+gmic-gimp 
 hugin 
 mypaint
 inkscape

From e04141ef29586fbab798504526fcacffe1f0ecd0 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 26 Aug 2014 00:14:57 -0500
Subject: [PATCH 19/60] make sure that teh cloud and workstation install trees
 do not remove java

---
 fedora-install-cloud.ks       | 2 --
 fedora-install-workstation.ks | 2 --
 2 files changed, 4 deletions(-)

diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index f2e2876..6643b6a 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -40,8 +40,6 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -generic*
 -GConf2-dbus*
 -bluez-gnome
-# Periods cause problems in paterns, so replace with *s
--java-1*8*0-openjdk
 -community-mysql*
 -jruby*
 
diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks
index 687b7d8..cfa516c 100644
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -40,8 +40,6 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -generic*
 -GConf2-dbus*
 -bluez-gnome
-# Periods cause problems in paterns, so replace with *s
--java-1*8*0-openjdk
 -community-mysql*
 -jruby*
 

From a23371ece070bbace8c5b0f2699c3f2b54ce75f8 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 26 Aug 2014 00:17:55 -0500
Subject: [PATCH 20/60] make sure cloud install tree has heat-cfntools TODO,
 fix in a much better way

---
 fedora-install-cloud.ks | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 6643b6a..25698a5 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -79,6 +79,9 @@ dracut-*
 # Things needed for installation
 @anaconda-tools
 
+# package cloud base image installs that probably should go in some comps group but what????
+heat-cfntools
+
 # Langpacks
 autocorr-*
 eclipse-nls-*

From d2b1c2a323f82676062e25a17fe33acea1ff0655 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Tue, 26 Aug 2014 23:24:19 +0200
Subject: [PATCH 21/60] workstation: Install the workstation-product group

---
 fedora-workstation-packages.ks | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index a8a0ffa..6cb894a 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -3,6 +3,7 @@
 @gnome-desktop
 @libreoffice
 @networkmanager-submodules
+@workstation-product
 
 # Workstation specific package
 firewalld-config-workstation

From ff66f181a8d8e606e4cb67d3a5d49b1285cb0c91 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Fri, 29 Aug 2014 14:17:16 +0200
Subject: [PATCH 22/60] workstation: Rely on comps for package selection

Drop most package removals / additions from the kickstart file and rely
on the @workstation-product comps group pulling in the correct packages.

We'll need package selection done in comps in order to make Workstation
netinstall work properly.

https://bugzilla.redhat.com/show_bug.cgi?id=1134524
---
 fedora-workstation-packages.ks | 65 +---------------------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index 6cb894a..d5c23cd 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -5,71 +5,8 @@
 @networkmanager-submodules
 @workstation-product
 
-# Workstation specific package
-firewalld-config-workstation
-
-#QT
-qt
-qt-settings
-qt-x11
-qt5-qtbase
-qt5-qtbase-gui
-qt5-qtdeclarative
-qt5-qtxmlpatterns
-
-devassistant
-scl-utils
-
-# FIXME; apparently the glibc maintainers dislike this, but it got put into the
-# desktop image at some point.  We won't touch this one for now.
-nss-mdns
-
-# This one needs to be kicked out of @standard
--smartmontools
-
-# We use gnome-control-center's printer and input sources panels instead
--system-config-printer
--im-chooser
-
--aisleriot
--baobab
--biosdevname
--coolkey
--deja-dup
--dtc
--dump
--ed
--finger
--ftp
--gc
+# Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
--gnu-free-fonts-common
--gnu-free-mono-fonts
--gnu-free-sans-fonts
--gnu-free-serif-fonts
--gtk2-immodule-xim
--gtk3-immodule-xim
--gtkmm24
--guile
--icedtea-web
--imsettings*
--irda-utils
--irqbalance
--isdn4k-utils
--kernel-modules-extra
--lftp
--linux-atm
--minicom
--nano
--ntsysv
--numactl
 -reiserfs-utils
--rsh
--tagsoup
--talk
--telnet
--uboot-tools
--xl2tpd
--NetworkManager-l2tp
 
 %end

From 47e7a468e0ebf878cd006925da24570b510105f4 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Fri, 29 Aug 2014 14:34:04 +0200
Subject: [PATCH 23/60] workstation: Sync groups with
 workstation-product-environment in comps

---
 fedora-workstation-packages.ks | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/fedora-workstation-packages.ks b/fedora-workstation-packages.ks
index d5c23cd..236a44f 100644
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -1,8 +1,21 @@
 %packages
-@firefox
-@gnome-desktop
+
+# Exclude unwanted groups that fedora-live-base.ks pulls in
+-@dial-up
+-@input-methods
+-@standard
+
+# Make sure to sync any additions / removals done here with
+# workstation-product-environment in comps
+@base-x
+@core
+@fonts
+@guest-desktop-agents
+@hardware-support
 @libreoffice
+@multimedia
 @networkmanager-submodules
+@printing
 @workstation-product
 
 # Exclude unwanted packages from @anaconda-tools group

From 745387e20e0c093a48a5fd50a1218a6e6e5ae155 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Fri, 29 Aug 2014 16:36:07 +0200
Subject: [PATCH 24/60] live-base: Drop a redundant package inclusion

Don't explicitly include qemu-guest-agent; it's is already listed in
@guest-desktop-agents comps group that is also pulled in to
fedora-live-base.
---
 fedora-live-base.ks | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 15db01a..9929fb7 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -44,9 +44,6 @@ memtest86+
 anaconda
 @anaconda-tools
 
-# Make live images easy to shutdown and the like in libvirt
-qemu-guest-agent
-
 %end
 
 %post

From 72304db6763362d841ebef1db7aa3e51b03862cd Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Fri, 29 Aug 2014 17:42:28 +0200
Subject: [PATCH 25/60] workstation: Use the package list from
 workstation-packages.ks for netinstall

https://bugzilla.redhat.com/show_bug.cgi?id=1134524
---
 fedora-install-workstation.ks | 106 +---------------------------------
 1 file changed, 2 insertions(+), 104 deletions(-)

diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks
index cfa516c..69a3ab8 100644
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -23,6 +23,8 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 #repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 #repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 
+%include fedora-workstation-packages.ks
+
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
 # @base got renamed to @standard, but @base is still included by default by pungi.
@@ -31,120 +33,16 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 # pungi is an inclusive depsolver so that multiple packages are brought 
 # in to satisify dependencies and we don't always want that. So we  use
 # an exclusion list to cut out things we don't want
-
 -kernel*debug*
 -kernel-kdump*
 -kernel-tools*
--syslog-ng*
 -astronomy-bookmarks
 -generic*
--GConf2-dbus*
--bluez-gnome
--community-mysql*
--jruby*
 
 # core
 kernel*
-dracut-*
-
-# Desktops
-
-## common stuff
-@base-x
-@guest-desktop-agents
-@guest-agents
-@standard
-@core
-@dial-up
-@fonts
-@input-methods
-@multimedia
-@hardware-support
-@printing
-@admin-tools
-@basic-desktop
-
-## GNOME
-@firefox
-@gnome-desktop
-@epiphany
-@libreoffice
-@gnome-games
-
-## KDE
-@kde-desktop
-@kde-apps
-@kde-education
-@kde-media
-@kde-office
-
-## XFCE
-@xfce-desktop
-@xfce-apps
-@xfce-extra-plugins
-@xfce-media
-@xfce-office
-
-## LXDE
-@lxde-desktop
-@lxde-apps
-@lxde-media
-@lxde-office
-
-## SUGAR
-@sugar-desktop
-@sugar-apps
-
-## MATE
-@mate-desktop
-
-## CINNAMON
-@cinnamon-desktop
-
-# Workstation
-@eclipse
-@development-libs
-@development-tools
-@c-development
-@rpm-development-tools
-@fedora-packager
-@gnome-software-development
-@kde-software-development
-@x-software-development
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@design-suite
-## Not included yet due to space concerns
-#@javaenterprise
-#@milkymist
-#@mingw32
-#@ocaml
-#@robotics-suite
-#@electronic-lab
 
 # Things needed for installation
 @anaconda-tools
 
-# Langpacks
-autocorr-*
-eclipse-nls-*
-hunspell-*
-hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
-man-pages-*
-mythes-*
--gimp-help-*
-
-# Removals
--PackageKit-zif
--zif
 %end

From ad74864bd62f759621f6db264826cb83bd7c043c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 22 Aug 2014 11:27:22 -0500
Subject: [PATCH 26/60] atomic folks decided to willy nilly change things so
 adjust appropriately

Conflicts:
	fedora-cloud-atomic.ks
---
 fedora-cloud-atomic.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 1b628ce..c77ffec 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -27,7 +27,7 @@ clearpart --all
 autopart
 
 # Equivalent of %include fedora-repo.ks
-ostreesetup --osname="fedora-atomic" --remote="fedora-atomic" --url="http://dl.fedoraproject.org/repo" --nogpg
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/ --ref=fedora-atomic/rawhide/x86_64/docker-host
 
 reboot
 

From 629c19368cb0bbe47f69e12e48b7160ac0cde670 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 2 Sep 2014 08:39:35 -0700
Subject: [PATCH 27/60] set up tmpfs in fstab, not livesys service (fixes
 #1135475)

---
 fedora-live-base.ks | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 9929fb7..395f6da 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -156,12 +156,6 @@ if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; the
   action "Mounting persistent /home" mountPersistentHome
 fi
 
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
-mount -t tmpfs vartmp /var/tmp
-[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
-
 if [ -n "\$configdone" ]; then
   exit 0
 fi
@@ -275,6 +269,14 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
 
+# make it so that we don't do writing to the overlay for things which
+# are just tmpdirs/caches
+# note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
+cat >> /etc/fstab << EOF
+vartmp   /var/tmp    tmpfs   defaults   0  0
+varcacheyum /var/cache/yum  tmpfs   mode=0755,context=system_u:object_r:rpm_var_cache_t:s0   0   0
+EOF
+
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)

From 22c7c00a6b8a8217c296e68700c305a239c6f71b Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Wed, 3 Sep 2014 13:20:26 -0400
Subject: [PATCH 28/60] use 'cmdline' for text-based install for docker image

---
 fedora-docker-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 1a335d3..44022d9 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -3,7 +3,7 @@
 # To keep this image minimal it only installs English language. You need to change
 # yum configuration in order to enable other languages.
 
-
+cmdline
 bootloader --location=none
 timezone America/New_York --isUtc --nontp
 rootpw --plaintext qweqwe

From 61407291893aecbde19c65b91160ba5bf29e76c2 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 3 Sep 2014 16:44:29 -0400
Subject: [PATCH 29/60] Add @domain-client to the Fedora Server kickstart

Also drop @multimedia as we don't need it on Server
---
 fedora-install-server.ks | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fedora-install-server.ks b/fedora-install-server.ks
index f469139..9b31c7d 100644
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -60,12 +60,12 @@ dracut-*
 
 -@legacy-fonts
 
+-@multimedia
 
 ## common stuff
 @guest-agents
 @standard
 @core
-@multimedia
 @hardware-support
 
 # Some development tools
@@ -82,6 +82,7 @@ dracut-*
 @server-product
 @headless-management
 @container-management
+@domain-client
 
 # Common server packages
 @mysql

From a7e8a12ce7355d0ecef58d353cdbf87a584b0824 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 4 Sep 2014 10:49:47 -0400
Subject: [PATCH 30/60] Add the server environment to the
 fedora-install-server.ks

---
 fedora-install-server.ks | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fedora-install-server.ks b/fedora-install-server.ks
index 9b31c7d..91b9d59 100644
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -79,6 +79,7 @@ dracut-*
 # Including this causes the fedora-release-server package to be included,
 # which in turn enables server-product-environment, and due to to its priority
 # this will be the default environment.
+@^server-product-environment
 @server-product
 @headless-management
 @container-management

From cece80a91b0e1bd428b525508ac2fe32f126fa7c Mon Sep 17 00:00:00 2001
From: Vaclav Pavlin <vpavlin@redhat.com>
Date: Mon, 1 Sep 2014 17:28:54 +0200
Subject: [PATCH 31/60] docker: Add fakesystemd to %packages to keep systemd
 out of base image

---
 fedora-docker-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 44022d9..365daac 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -20,7 +20,7 @@ bash
 fedora-release
 vim-minimal
 yum
-#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
+fakesystemd
 -kernel
 
 

From 5e49468d39082f6b7e79c7c40fd929782637b991 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sat, 6 Sep 2014 18:11:51 -0700
Subject: [PATCH 32/60] we don't need to nix hwclock-save.service any more...

...because systemd dropped it in 2011:
http://lists.freedesktop.org/archives/systemd-commits/2011-May/001088.html
---
 fedora-live-base.ks | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 395f6da..b1c3fae 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -74,9 +74,6 @@ exists() {
     \$*
 }
 
-# Make sure we don't mangle the hardware clock on shutdown
-ln -sf /dev/null /etc/systemd/system/hwclock-save.service
-
 livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
   if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then

From dcb9dc8ec8bf357f68bac7d9c8892f06d2f66c3b Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sun, 7 Sep 2014 08:37:40 +0200
Subject: [PATCH 33/60] f21, mate-compiz: temporarily fix for theme issue with
 anaconda rhbz 1136994

---
 fedora-live-mate-compiz.ks | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fedora-live-mate-compiz.ks b/fedora-live-mate-compiz.ks
index 682181d..2acf78a 100644
--- a/fedora-live-mate-compiz.ks
+++ b/fedora-live-mate-compiz.ks
@@ -19,6 +19,8 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
+# temporarily fix for theme issue with anaconda rhbz (#1136994)
+sed -i "s/^gtk-theme='BlueMenta'/gtk-theme='Adwaita'/" /usr/share/glib-2.0/schemas/mate-fedora.gschema.override
 
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

From 0edeedbde3182adf279a7e635deaa51a14fc2a7f Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sun, 7 Sep 2014 08:42:24 +0200
Subject: [PATCH 34/60] mate livecd: clean up file list

---
 fedora-livecd-mate-compiz.ks | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fedora-livecd-mate-compiz.ks b/fedora-livecd-mate-compiz.ks
index 6dee447..8f9bba9 100644
--- a/fedora-livecd-mate-compiz.ks
+++ b/fedora-livecd-mate-compiz.ks
@@ -17,7 +17,6 @@
 -bluez-cups
 -@dial-up
 -dnf
--firefox
 -gnome-bluetooth-libs
 -gnome-icon-theme-symbolic
 -gnome-software
@@ -25,7 +24,6 @@
 -@guest-desktop-agents
 -@libreoffice
 -@mate-applications
--mate-bluetooth
 -mate-icon-theme-faenza
 -transmission-gtk
 
@@ -33,9 +31,6 @@
 -cjkuni-uming-fonts
 -wqy-zenhei-fonts
 
-# A web browser would be nice for a live cd
-midori
-
 # Drop the Java plugin
 -icedtea-web
 -java-1.8.0-openjdk

From cc5246b9ba40329ee869c403eb6853d071320ec4 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Tue, 9 Sep 2014 14:07:02 -0400
Subject: [PATCH 35/60] fixes from Ian McLeod to make composes work using new
 scheme.

NOTE: this WILL NOT WORK without other changes to coms and spin/install (but
the current ones are broken anyway so I'm committing this).

See https://lists.fedoraproject.org/pipermail/cloud/2014-September/004207.html
for details
---
 fedora-cloud-base.ks         | 23 ++---------------------
 fedora-cloud-bigdata.ks      | 24 +++---------------------
 fedora-cloud-experimental.ks | 22 ++--------------------
 fedora-install-cloud.ks      |  6 +++---
 4 files changed, 10 insertions(+), 65 deletions(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index bea106a..a924904 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -34,7 +34,6 @@ part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
-
 reboot
 
 # Package list.
@@ -44,32 +43,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
+@cloud-server
 
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 5d41dc8..b8315bb 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -44,31 +44,13 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
-
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
--dracut-config-rescue
-
-syslinux-extlinux 
+@cloud-server
 
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
+# rescue mode generally isn't useful in the cloud context
+-dracut-config-rescue
 
 # Some things from @core we can do without in a minimal install
 -biosdevname
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index f6a3bee..e181d67 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -35,32 +35,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
+@cloud-server
 
-# cloud-init does magical things with EC2 metadata, including provisioning
-# a user account with ssh keys.
-cloud-init
-
-# this is used by openstack's cloud orchestration framework (and it's small)
-heat-cfntools
-
-# need this for growpart, because parted doesn't yet support resizepart
-# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-cloud-utils-growpart
-
-# We need this image to be portable; also, rescue mode isn't useful here.
-dracut-config-generic
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 25698a5..af66142 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -1,4 +1,4 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
 # Maintained by the Fedora Release Engineering team:
 # https://fedoraproject.org/wiki/ReleaseEngineering
 # mailto:rel-eng@lists.fedoraproject.org
@@ -79,8 +79,8 @@ dracut-*
 # Things needed for installation
 @anaconda-tools
 
-# package cloud base image installs that probably should go in some comps group but what????
-heat-cfntools
+# Packages to enable server images to run in cloud environments
+@cloud-server
 
 # Langpacks
 autocorr-*

From 94283bfff22743f615fe6a6a9472fa8c08cddca1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 10 Sep 2014 13:03:29 -0500
Subject: [PATCH 36/60] Revert "docker: Add fakesystemd to %packages to keep
 systemd out of base image"

This reverts commit f42fe5d85aab6526db1dd847c49ceac0fea05443.
---
 fedora-docker-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks
index 365daac..44022d9 100644
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -20,7 +20,7 @@ bash
 fedora-release
 vim-minimal
 yum
-fakesystemd
+#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel
 
 

From d338e1456a97e48670876333f926afc4fe51daef Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 10 Sep 2014 13:06:29 -0500
Subject: [PATCH 37/60] CLOUD: install the cloud-server-environment, dont't
 install firewalld

select the cloud-server-environment instead of the different groups.
don't install and uninstall firewalld since anaconda allows us to not need it
---
 fedora-cloud-base.ks | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index a924904..dd19058 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -39,18 +39,12 @@ reboot
 # Package list.
 %packages
 
-fedora-release-cloud
-
 kernel-core
-@core
-@cloud-server
+@cloud-server-environment
 
 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-# Needed initially, but removed below.
-firewalld
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
@@ -115,11 +109,6 @@ echo .
 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."

From d3a2195d57323685918c73504db7e3cd2703caca Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 10 Sep 2014 13:12:41 -0500
Subject: [PATCH 38/60] make sure all the groups from the
 cloud-serevr-environment are in the install tree

---
 fedora-install-cloud.ks | 50 ++++++++++++++---------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index af66142..7dc88a5 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -47,51 +47,35 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 kernel*
 dracut-*
 
-# Desktops
-
-## common stuff
-@base-x
-@guest-desktop-agents
-@guest-agents
-@standard
-@core
-@dial-up
-@fonts
-@input-methods
-@multimedia
-@hardware-support
-@printing
-@admin-tools
-@basic-desktop
-
-
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@javaenterprise
 
 # Things needed for installation
 @anaconda-tools
 
 # Packages to enable server images to run in cloud environments
 @cloud-server
+@core
+@standard
+@headless-management
+@dogtag
+@directory-server
+@dns-server
+@freeipa-server
+@ftp-server
+@guest-agents
+@ha
+@load-balancer
+@mail-server
+@mysql
+@network-server
+@smb-server
+@sql-server
+@web-server
 
 # Langpacks
 autocorr-*
-eclipse-nls-*
 hunspell-*
 hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
 man-pages-*
-mythes-*
 -gimp-help-*
 
 # Removals

From 3eafe889d91bfc70f0107670d5e8b5a34a1d0271 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ra.ausil.us>
Date: Wed, 10 Sep 2014 19:01:21 -0500
Subject: [PATCH 39/60] rename kickstarts for new naming policy

---
 fedora-live-design-suite.ks => fedora-live-design_suite.ks        | 0
 fedora-live-jam-kde.ks => fedora-live-jam_kde.ks                  | 0
 fedora-live-mate-compiz.ks => fedora-live-mate_compiz.ks          | 0
 fedora-livecd-mate-compiz.ks => fedora-livecd-mate_compiz.ks      | 0
 ...-livedvd-electronic-lab.ks => fedora-livedvd-electronic_lab.ks | 0
 ...-livedvd-scientific-kde.ks => fedora-livedvd-scientific_kde.ks | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename fedora-live-design-suite.ks => fedora-live-design_suite.ks (100%)
 rename fedora-live-jam-kde.ks => fedora-live-jam_kde.ks (100%)
 rename fedora-live-mate-compiz.ks => fedora-live-mate_compiz.ks (100%)
 rename fedora-livecd-mate-compiz.ks => fedora-livecd-mate_compiz.ks (100%)
 rename fedora-livedvd-electronic-lab.ks => fedora-livedvd-electronic_lab.ks (100%)
 rename fedora-livedvd-scientific-kde.ks => fedora-livedvd-scientific_kde.ks (100%)

diff --git a/fedora-live-design-suite.ks b/fedora-live-design_suite.ks
similarity index 100%
rename from fedora-live-design-suite.ks
rename to fedora-live-design_suite.ks
diff --git a/fedora-live-jam-kde.ks b/fedora-live-jam_kde.ks
similarity index 100%
rename from fedora-live-jam-kde.ks
rename to fedora-live-jam_kde.ks
diff --git a/fedora-live-mate-compiz.ks b/fedora-live-mate_compiz.ks
similarity index 100%
rename from fedora-live-mate-compiz.ks
rename to fedora-live-mate_compiz.ks
diff --git a/fedora-livecd-mate-compiz.ks b/fedora-livecd-mate_compiz.ks
similarity index 100%
rename from fedora-livecd-mate-compiz.ks
rename to fedora-livecd-mate_compiz.ks
diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic_lab.ks
similarity index 100%
rename from fedora-livedvd-electronic-lab.ks
rename to fedora-livedvd-electronic_lab.ks
diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific_kde.ks
similarity index 100%
rename from fedora-livedvd-scientific-kde.ks
rename to fedora-livedvd-scientific_kde.ks

From 731df4402e973497b0ead6b16988ca4f2559f62e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 11 Sep 2014 16:58:08 -0500
Subject: [PATCH 40/60] cloud: do not explicitly remove jruby

---
 fedora-install-cloud.ks | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 7dc88a5..c9b5974 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -41,7 +41,6 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -GConf2-dbus*
 -bluez-gnome
 -community-mysql*
--jruby*
 
 # core
 kernel*

From ca1c7727aa36b7264b6e7d3d144b44b483f15ccd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 11 Sep 2014 15:01:59 -0700
Subject: [PATCH 41/60] explain why it's not safe to drop jruby

---
 fedora-install-cloud.ks | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index c9b5974..281e0ae 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -41,6 +41,11 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -GConf2-dbus*
 -bluez-gnome
 -community-mysql*
+# jruby used to be in this list, but springframework-context explicitly
+# requires it, not just 'any ruby implemention' - please check for things
+# on the image that require mvn(org.jruby:jruby) before adding jruby to
+# this list again - adamw 2014/09
+#-jruby
 
 # core
 kernel*

From 9d66334a555f57c97cea8dbe71ec4def4bae327e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 11 Sep 2014 15:12:10 -0700
Subject: [PATCH 42/60] fix exclusion of generic packages to not also exclude
 generic-jms-ra

---
 fedora-install-cloud.ks | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks
index 281e0ae..5051be1 100644
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -37,7 +37,9 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -kernel-tools*
 -syslog-ng*
 -astronomy-bookmarks
--generic*
+# generic* would match generic-jms-ra, so don't 'simplify' this
+-generic-logos*
+-generic-release*
 -GConf2-dbus*
 -bluez-gnome
 -community-mysql*

From 91e15f750cb3168fc6c4b3f5322a6ed850a7f455 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 11 Sep 2014 18:41:58 -0500
Subject: [PATCH 43/60] CLOUD: install the environment correctly

---
 fedora-cloud-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index dd19058..6b0867b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -40,7 +40,7 @@ reboot
 %packages
 
 kernel-core
-@cloud-server-environment
+@^cloud-server-environment
 
 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue

From 7df1d7ab82a808e095c800bc98ec05134bb3d422 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 15 Sep 2014 09:08:54 -0700
Subject: [PATCH 44/60] from kparal: fix Test Day browser configuration

---
 custom/qa-test-day.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom/qa-test-day.ks b/custom/qa-test-day.ks
index 4c7beeb..32f065e 100644
--- a/custom/qa-test-day.ks
+++ b/custom/qa-test-day.ks
@@ -136,7 +136,7 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
 rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
 
 PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
-cat << FOE >> $PREFDIR/test-day.js
+cat << FOE >> $PREFDIR/00-test-day.js
 pref("startup.homepage_welcome_url","");
 pref("startup.homepage_override_url","");
 pref("browser.rights.3.shown", true);

From fdacfc48cd3af99e7b9d52230d57eb4e9dab94c9 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Wed, 17 Sep 2014 12:39:19 -0500
Subject: [PATCH 45/60] mate: fix fallout from kickstart renaming

should help fix recent mate spin compose failures
---
 fedora-livecd-mate_compiz.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-livecd-mate_compiz.ks b/fedora-livecd-mate_compiz.ks
index 8f9bba9..a8af381 100644
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -3,7 +3,7 @@
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 
-%include fedora-live-mate-compiz.ks
+%include fedora-live-mate_compiz.ks
 %include fedora-live-minimization.ks
 
 %packages

From fff32ba339b5000946e04b8bd51a4b3fc25b2e6c Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Thu, 18 Sep 2014 00:01:41 +0200
Subject: [PATCH 46/60] fedora-livecd-kde.ks: update CJK font blacklist
 (#1142512)

Also change the comment to document the limit as 1 GB (as listed in the
specs) rather than 1 GiB.
---
 fedora-livecd-kde.ks | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 5a25a46..b130b66 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -46,11 +46,12 @@ kdegames-minimal
 ### space issues
 
 # fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts	# a compact CJK font, to replace:
--nhn-nanum-gothic-fonts	# Korean
--vlgothic-fonts		# Japanese
--wqy-zenhei-fonts	# simplified Chinese
--cjkuni-uming-fonts	# traditional Chinese
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-nhn-nanum-gothic-fonts			# Korean (old name, still in comps)
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese
 
 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols

From 96a16eefc4f4be19d9f88419f8a2779db16b0ff7 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 19 Sep 2014 11:06:36 -0700
Subject: [PATCH 47/60] from spot: add comfortaa fonts to live-base to fix
 #1116497

---
 fedora-live-base.ks | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index b1c3fae..a7d50a9 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -44,6 +44,9 @@ memtest86+
 anaconda
 @anaconda-tools
 
+# Need aajohan-comfortaa-fonts for the SVG rnotes images
+aajohan-comfortaa-fonts
+
 %end
 
 %post

From ef404752a239ae617bbc5cedf8523b4f1871da71 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 26 Sep 2014 20:21:25 -0500
Subject: [PATCH 48/60] kde: -system-config-users

update comment about gnome-disk-utility
add comment about removing system-config-date someday
---
 fedora-livecd-kde.ks | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index b130b66..e217b43 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -66,8 +66,12 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 # save some space (from @standard)
 -make
 
-# save space (it pulls in gdisk/udisks2/libicu)
+# admin-tools
 -gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer/use kusers
+-system-config-users
 
 ## avoid serious bugs by omitting broken stuff
 

From 151836c00d57bafe388a7de3b485c1478083b4c3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 26 Sep 2014 20:32:41 -0500
Subject: [PATCH 49/60] kde: -system-config-services (prefer kcm_systemd)

---
 fedora-livecd-kde.ks | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index e217b43..47ad054 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -70,6 +70,8 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 -gnome-disk-utility
 # kcm_clock still lacks some features, so keep system-config-date around
 #-system-config-date
+# prefer kcm_systemd
+-system-config-services
 # prefer/use kusers
 -system-config-users
 

From 8ba8270ff8464bc975d64efc11f29d5b04dc51d8 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Sat, 27 Sep 2014 09:06:06 -0400
Subject: [PATCH 50/60] only english to keep the locale archive down until
 there's a better solution

---
 fedora-cloud-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 6b0867b..646e93c 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -37,7 +37,7 @@ part / --size 3000 --fstype ext4
 reboot
 
 # Package list.
-%packages
+%packages --instLangs=en
 
 kernel-core
 @^cloud-server-environment

From f64b8c735301dc82ea4e5f9977206af6c81264e8 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 27 Sep 2014 12:05:26 -0600
Subject: [PATCH 51/60] Drop some more large ibus stuff to try and get back
 under size on xfce.

---
 fedora-xfce-packages.ks | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks
index f9ffa8d..acca154 100644
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -41,6 +41,10 @@ gnome-keyring-pam
 -rodent-icon-theme  # save 34MB
 -skkdic             # save 25MB
 -naver-nanum-gothic-fonts # save 14MB
+-ibus-kkc
+-ibus-libpinyin
+-libpinyin-data
+-libkkc-data
 
 # drop some system-config things
 -system-config-network

From 3ae4c4139a6ef929075a61b4c2033cc020e35770 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Wed, 1 Oct 2014 17:47:15 +0200
Subject: [PATCH 52/60] workstation: Sync the list of favourite apps with
 upstream

---
 fedora-live-workstation.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks
index 4a0fe16..ea5f9ca 100644
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -34,7 +34,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up

From 5f0fcd1d5ed06bc60674c48714fe41a69716d4c5 Mon Sep 17 00:00:00 2001
From: Matthew Miller <mattdm@mattdm.org>
Date: Thu, 2 Oct 2014 13:22:33 -0400
Subject: [PATCH 53/60] 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)

From 30680a984e6d8da84b7ec9448616a68c0b7fcc30 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Fri, 3 Oct 2014 10:32:18 +0100
Subject: [PATCH 54/60] SoaS: fix naming (once and for all)

---
 fedora-livecd-soas.ks | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index a23afed..44f5d31 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -26,9 +26,9 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick 11 (Unknown)
-Fedora release 21 (Rawhide)
+Sugar on a Stick
 EOF
+cat /etc/fedora-release >> /boot/olpc_build
 
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF

From 09661de4524b39bc20a7e0c5f3d9095d7d53fa95 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sun, 5 Oct 2014 11:03:18 -0600
Subject: [PATCH 55/60] Try and prune some more space on Xfce spin

---
 fedora-xfce-packages.ks | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks
index acca154..e40952a 100644
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -33,6 +33,7 @@ gnome-keyring-pam
 -gnumeric
 -foomatic-db-ppds
 -foomatic
+-gutenprint
 -stix-fonts
 -ibus-typing-booster
 -xfce4-sensors-plugin
@@ -45,6 +46,11 @@ gnome-keyring-pam
 -ibus-libpinyin
 -libpinyin-data
 -libkkc-data
+# Drop some fonts for space
+-vlgothic-fonts
+-paratype-pt-sans-fonts
+-jomolhari-fonts
+-sil-abyssinca-fonts
 
 # drop some system-config things
 -system-config-network

From 79fef84e8f448e73cb98cbb29449043b577148e4 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Sat, 11 Oct 2014 01:04:16 -0500
Subject: [PATCH 56/60] Remove supertuxcart to get under size again

---
 fedora-livedvd-games.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-livedvd-games.ks b/fedora-livedvd-games.ks
index 3773537..212035c 100644
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@@ -58,7 +58,7 @@ nogravity
 pinball
 scorched3d
 supertux
-supertuxkart
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth

From 3b362be489a6424d9beddb73954a21481be44bb0 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 13 Oct 2014 10:41:38 -0600
Subject: [PATCH 57/60] Try some more removals to get Xfce under size

---
 fedora-xfce-packages.ks | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks
index e40952a..3c0a7cd 100644
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -24,6 +24,7 @@ gnome-keyring-pam
 
 # save some space
 -autofs
+-pidgin
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
@@ -34,6 +35,7 @@ gnome-keyring-pam
 -foomatic-db-ppds
 -foomatic
 -gutenprint
+-gutenprint-cups
 -stix-fonts
 -ibus-typing-booster
 -xfce4-sensors-plugin

From 5f7ca87f017d5d4aa1bcec2e6aabbf849a6ca60b Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 13 Oct 2014 19:11:43 +0200
Subject: [PATCH 58/60] xfce: fix typo

---
 fedora-xfce-packages.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-xfce-packages.ks b/fedora-xfce-packages.ks
index 3c0a7cd..4ccac14 100644
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -52,7 +52,7 @@ gnome-keyring-pam
 -vlgothic-fonts
 -paratype-pt-sans-fonts
 -jomolhari-fonts
--sil-abyssinca-fonts
+-sil-abyssinica-fonts
 
 # drop some system-config things
 -system-config-network

From 395757c4b67b706591301ca57786ca9b4be189d8 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Mon, 13 Oct 2014 19:17:11 +0200
Subject: [PATCH 59/60] mate: sync master with f21 branch

---
 fedora-live-mate_compiz.ks   |  3 ---
 fedora-livecd-mate_compiz.ks | 26 ++++++++++++++++++++++++--
 fedora-mate-packages.ks      |  1 -
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/fedora-live-mate_compiz.ks b/fedora-live-mate_compiz.ks
index 2acf78a..331d1d5 100644
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -19,9 +19,6 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
-# temporarily fix for theme issue with anaconda rhbz (#1136994)
-sed -i "s/^gtk-theme='BlueMenta'/gtk-theme='Adwaita'/" /usr/share/glib-2.0/schemas/mate-fedora.gschema.override
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
diff --git a/fedora-livecd-mate_compiz.ks b/fedora-livecd-mate_compiz.ks
index a8af381..2582ed4 100644
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -26,10 +26,29 @@
 -@mate-applications
 -mate-icon-theme-faenza
 -transmission-gtk
+-samba-client
+-gnome-themes
+-fedora-icon-theme
+-espeak
+-gstreamer-plugins-espeak
+-ibus-typing-booster
+-ibus-kkc
+-libkkc
+-libkkc-data        #save 30MB
+-skkdic             # save 25MB
+-ibus-libpinyin
+-libpinyin
+-libpinyin-data     #save 31MB
+-colord
 
 # Drop oversized fonts that aren't needed
--cjkuni-uming-fonts
--wqy-zenhei-fonts
+-adobe-source-han-* # save 94MB
+-naver-nanum-gothic-fonts # save 14MB
+-stix-fonts
+-vlgothic-fonts
+-paratype-pt-sans-fonts
+-jomolhari-fonts
+-sil-abyssinica-fonts
 
 # Drop the Java plugin
 -icedtea-web
@@ -41,6 +60,9 @@
 # No printing
 -foomatic-db-ppds
 -foomatic
+-gutenprint
+-gutenprint-cups
+-gutenprint-libs
 
 # Dictionaries are big
 # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
diff --git a/fedora-mate-packages.ks b/fedora-mate-packages.ks
index 6818cad..9b9a273 100644
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -11,7 +11,6 @@ compiz-plugins-extra
 compiz-manager
 compizconfig-python
 compiz-plugins-unsupported
-compiz-bcop
 compiz-mate
 libcompizconfig
 compiz-plugins-main

From 8d5f9bb3211a4a969630e27b7c3ec406f8c7b9bf Mon Sep 17 00:00:00 2001
From: luya <luya@kwetu.telus1603>
Date: Mon, 13 Oct 2014 23:43:26 -0700
Subject: [PATCH 60/60] add LuxRender and Yafaray plugiins for Blender

---
 fedora-live-design_suite.ks | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index b690bd1..549271f 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -16,6 +16,9 @@ part / --size 8192
 
 # graphics
 blender
+# add blender plugins
+LuxRender-blender
+YafaRay-blender
 bluefish 
 #cinepaint
 cmyktool