Remove supertuxcart to get under size again

there is breaking openstack

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);

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

fedora-cloud-atomic.ks

@@ -23,55 +23,13 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
+# Atomic differs from cloud - we want LVM
+autopart
 
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
 
 reboot
 
-# Package list.
-%packages
-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

fedora-cloud-base.ks

@@ -25,7 +25,7 @@ firewall --disabled
 
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
+network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
@@ -34,39 +34,17 @@ part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
-
 reboot
 
 # Package list.
-%packages
+%packages --instLangs=en
+
 kernel-core
-@core
-grubby
+@^cloud-server-environment
 
-# 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
@@ -131,10 +109,10 @@ 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.
+# 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"
+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)

fedora-cloud-bigdata.ks

@@ -1,234 +0,0 @@
-# This is a Fedora 21 spin designed based on the Fedora Cloud Base Image
-# but tailored specifically for Big Data processing out-of-the-box.
-# Primarily, it builds on that image but adds extra packages, but over
-# time may have additional focus.
-#
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. Cloud-init
-# creates a user account named "fedora" with passwordless sudo access. The
-# root password is empty and locked by default.
-#
-# Note that unlike the standard F20 install, this image has /tmp on disk
-# rather than in tmpfs, since memory is usually at a premium.
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-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
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages
-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
-# 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
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 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/ 
-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.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
-
-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
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-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 || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-

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
@@ -31,33 +30,18 @@ reboot
 
 # Package list.
 %packages --excludedocs --instLangs=en_US
+
+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 
-
-# cherry-pick a few things from @standard
-tar
-rsync
-
-# anaconda needs authconfig to be installed into the image to setup some things
-authconfig
+# Needed initially, but removed below.
+firewalld
 
 # Some things from @core we can do without in a minimal install
 -biosdevname
@@ -67,9 +51,7 @@ authconfig
 -kbd
 -uboot-tools
 -kernel
--firewalld
 -grub2
--man-db
 
 %end
 
@@ -116,10 +98,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."

fedora-docker-base.ks

@@ -0,0 +1,50 @@
+# 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.
+
+cmdline
+bootloader --location=none
+timezone America/New_York --isUtc --nontp
+rootpw --plaintext qweqwe
+
+keyboard us
+firewall --disable
+zerombr
+clearpart --all
+part / --size 3000 --fstype ext4
+network --bootproto=dhcp --device=link --activate --onboot=on
+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

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
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 
 # In non-master branches the fedora repo commands should be uncommented
-#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
+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
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -37,60 +37,51 @@ 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
-# Periods cause problems in paterns, so replace with *s
--java-1*8*0-openjdk
 -community-mysql*
--jruby*
+# 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*
 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

fedora-install-server.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 
 # In non-master branches the fedora repo commands should be uncommented
-#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
+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
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -60,21 +60,31 @@ dracut-*
 
 -@legacy-fonts
 
+-@multimedia
 
 ## common stuff
 @guest-agents
 @standard
 @core
-@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-environment
+@server-product
+@headless-management
+@container-management
+@domain-client
+
 # Common server packages
 @mysql
 @sql-server
@@ -103,8 +113,6 @@ dracut-*
 @load-balancer
 @ha
 
-@container-management
-@headless-management
 @javaenterprise
 
 # “uservisible” groups we want to offer

fedora-install-workstation.ks

@@ -16,12 +16,14 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 
 # In non-master branches the fedora repo commands should be uncommented
-#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
+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)
@@ -31,122 +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
-# Periods cause problems in paterns, so replace with *s
--java-1*8*0-openjdk
--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

fedora-live-base.ks

@@ -44,8 +44,8 @@ memtest86+
 anaconda
 @anaconda-tools
 
-# Make live images easy to shutdown and the like in libvirt
-qemu-guest-agent
+# Need aajohan-comfortaa-fonts for the SVG rnotes images
+aajohan-comfortaa-fonts
 
 %end
 
@@ -77,9 +77,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
@@ -159,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
@@ -278,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)
@@ -303,7 +302,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

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

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

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
@@ -65,8 +66,14 @@ 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 kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
 
 ## avoid serious bugs by omitting broken stuff
 

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
@@ -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

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

fedora-livedvd-games.ks

@@ -58,7 +58,7 @@ nogravity
 pinball
 scorched3d
 supertux
-supertuxkart
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth

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

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-%include fedora-repo-rawhide.ks
+#%include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
-# %include fedora-repo-not-rawhide.ks
+%include fedora-repo-not-rawhide.ks

fedora-soas-packages.ks

@@ -29,6 +29,10 @@
 -realmd
 -eekboard-libs
 -open-vm-tools*
+-gfs2-utils
+-abrt-cli
+-ibus*
+-hyperv-daemons
 
 # == Core Sugar Platform ==
 @sugar-desktop

fedora-workstation-packages.ks

@@ -1,70 +1,25 @@
 %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
 
-#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
--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

fedora-xfce-packages.ks

@@ -33,10 +33,24 @@ gnome-keyring-pam
 -gnumeric
 -foomatic-db-ppds
 -foomatic
+-gutenprint
 -stix-fonts
 -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
+-ibus-kkc
+-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