put experimental cloud spin back to same as base cloud spin exept for i18n/docs

see https://bugzilla.redhat.com/show_bug.cgi?id=1116291

Makefile

@@ -1,9 +1,5 @@
-# Get the version name first by seeing if HEAD is tagged
+# Get a version name based off the nearest tag (include lightweight tags)
-version := $(shell git tag --points-at HEAD -l '0.*.*' | sort -r | head -1)
+version := $(shell git describe --tags)
-# And if it wasn't use a git hash
-ifeq ($(version),)
-  version := $(shell git log -1 --abbrev=8 --pretty=git%h)
-endif
 
 DESTDIR := /usr
 

custom/qa-test-day.ks

@@ -135,29 +135,14 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
 # Remove anaconda welcome screen (if it exists), it would display instead of ours
 rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
 
-# Change Firefox start page to open Test Day wiki and IRC chat
+PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
-# (and a few more properties)
+cat << FOE >> $PREFDIR/test-day.js
-mkdir /tmp/firefox
-unzip /usr/lib*/firefox/browser/omni.ja -d /tmp/firefox
-
-cat << FOE > /tmp/firefox/chrome/en-US/locale/branding/browserconfig.properties
-browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day
-FOE
-
-cat << FOE >> /tmp/firefox/defaults/preferences/firefox-branding.js
 pref("startup.homepage_welcome_url","");
 pref("startup.homepage_override_url","");
 pref("browser.rights.3.shown", true);
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day");
 FOE
 
-# We need to re-zip the whole archive (instead of just updating files), because
-# the original archive is "Firefox optimized" and updating doesn't work
-# https://bugzilla.mozilla.org/show_bug.cgi?id=605524
-OMNIJA=`ls /usr/lib*/firefox/browser/omni.ja`
-rm -f $OMNIJA
-(cd /tmp/firefox; zip -r -0 $OMNIJA *)
-rm -rf /tmp/firefox
-
 # Adjust launchers in dash using a vendor override. (Adding a profile would
 # be another way to do this.)
 cat << FOE >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override

fedora-arm-base.ks

@@ -5,7 +5,11 @@ selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
 # configure extlinux bootloader
-bootloader --extlinux
+bootloader extlinux
+
+part /boot --size=512 --fstype ext3
+part swap --size=512 --fstype swap
+part / --size=3000 --fstype ext4
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
@@ -21,7 +25,6 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 @dial-up
 
 kernel
-kernel-lpae
 
 dracut-config-generic
 
@@ -29,29 +32,38 @@ chrony
 arm-boot-config
 extlinux-bootloader
 initial-setup
+initial-setup-gui
 #lets resize / on first boot
 dracut-modules-growroot
 
+# remove this in %post
+dracut-config-generic
+
 # install uboot images
-uboot-beagle
+uboot-images-armv7
-uboot-beaglebone
-uboot-origen
-uboot-panda
-uboot-smdkv310
-uboot-uevm
-uboot-wandboard_dl
-uboot-wandboard_solo
-uboot-wandboard_quad
 
 %end
 
 %post
 
+# work around for poor key import UI in PackageKit
+rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=armhfp
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+echo "Packages within this LiveCD"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 
 /usr/sbin/a-b-c
+
+yum -y remove dracut-config-generic
+
 %end
 

fedora-arm-desktop-vfat.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-desktop-packages.ks
-%include fedora-arm-vfat-partitioning.ks
-
-part / --size=4000 --fstype ext4
-
-%packages
--initial-setup
-
-%end
-

fedora-arm-desktop.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-desktop-packages.ks
-%include fedora-arm-partitioning.ks
-
-part / --size=4000 --fstype ext4
-
-%packages
--initial-setup
-
-%end
-

fedora-arm-kde-vfat.ks

@@ -1,13 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-kde-packages.ks
-%include fedora-arm-vfat-partitioning.ks
-
-part / --size=4000 --fstype ext4
-
-%post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
-
-%end

fedora-arm-kde.ks

@@ -1,7 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
-%include fedora-arm-partitioning.ks
 
 part / --size=4000 --fstype ext4
 

fedora-arm-lxde-vfat.ks

@@ -1,11 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxde-packages.ks
-%include fedora-arm-vfat-partitioning.ks
-
-%post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
-
-%end

fedora-arm-lxde.ks

@@ -1,7 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-lxde-packages.ks
-%include fedora-arm-partitioning.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-mate-vfat.ks

@@ -1,13 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-mate-packages.ks
-%include fedora-arm-vfat-partitioning.ks
-
-part / --size=5000 --fstype ext4
-
-%post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
-
-%end

fedora-arm-mate.ks

@@ -1,7 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks
-%include fedora-arm-partitioning.ks
 
 part / --size=5000 --fstype ext4
 

fedora-arm-minimal-vfat.ks

@@ -1,20 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-vfat-partitioning.ks
-
-part swap --size=128 --fstype swap
-part / --size=1400 --fstype ext4
-
-%post
-
-# 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 .
-
-echo -n "Enabling initial-setup text mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
-echo .
-
-%end
-

fedora-arm-minimal.ks

@@ -1,9 +1,14 @@
 %include fedora-arm-base.ks
-%include fedora-arm-partitioning.ks
 
 part swap --size=128 --fstype swap
 part / --size=1400 --fstype ext4
 
+%packages
+-@standard
+-@dial-up
+-initial-setup-gui
+%end
+
 %post
 
 # setup systemd to boot to the right runlevel

fedora-arm-partitioning.ks

@@ -1,4 +0,0 @@
-part /boot --size=512 --fstype ext3
-part swap --size=512 --fstype swap
-part / --size=3000 --fstype ext4
-

fedora-arm-soas-vfat.ks

@@ -1,11 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-soas-packages.ks
-%include fedora-arm-vfat-partitioning.ks
-
-%post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
-
-%end

fedora-arm-soas.ks

@@ -1,7 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-soas-packages.ks
-%include fedora-arm-partitioning.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-vfat-partitioning.ks

@@ -1,4 +0,0 @@
-part /boot/uboot --size=20 --fstype vfat
-part swap --size=512 --fstype swap
-part / --size=3400 --fstype ext4
-

fedora-arm-workstation.ks

@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-workstation-packages.ks
+
+part / --size=5000 --fstype ext4
+
+%packages
+-initial-setup
+-initial-setup-gui
+
+%end
+

fedora-arm-xbase.ks

@@ -6,15 +6,3 @@
 @printing
 %end
 
-%post
-# X on arm does not detect the driver needed correctly so we need a snippet to set something
-# using fbdev as the lowest common denominator.
-
-cat > /etc/X11/xorg.conf.d/fbdev.conf <<EOF
-Section "Device"
-    Identifier  "Display"
-    Driver      "fbdev"
-EndSection
-EOF
-
-%end

fedora-arm-xfce-vfat.ks

@@ -1,11 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-xfce-packages.ks
-%include fedora-arm-vfat-partitioning.ks
-
-%post
-echo -n "Enabling initial-setup gui mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
-echo .
-
-%end

fedora-arm-xfce.ks

@@ -1,7 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-%include fedora-arm-partitioning.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-cloud-atomic.ks

@@ -0,0 +1,232 @@
+# Fedora Atomic is a cloud-focused spin implementing the Project Atomic
+# patterns. 
+#
+# RIGHT NOW, this is very like the traditional cloud image -- this is
+# just a starting point.
+
+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
+
+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
+# 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-base.ks

@@ -0,0 +1,237 @@
+# This is a basic Fedora 21 spin designed to work in OpenStack and other
+# private cloud environments. 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.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
+
+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
+
+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
+# 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-bigdata.ks

@@ -0,0 +1,237 @@
+# 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
+
+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
+# 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

@@ -0,0 +1,228 @@
+# This is a spin of the Fedora cloud image designed for trying out new
+# images in rawhide. It won't be built for non-rawhide trees, let alone
+# actual releases.
+
+cmdline
+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 --excludedocs --instLangs=en_US
+
+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
+# 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-desktop-packages.ks

@@ -2,6 +2,7 @@
 @firefox
 @gnome-desktop
 @libreoffice
+@networkmanager-submodules
 
 # 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.

fedora-install-cloud.ks

@@ -0,0 +1,99 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# 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
+
+# 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
+
+# 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.
+%packages --default
+
+# 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
+
+
+@virtualization
+@web-server
+@mongodb
+@perl-web
+@php
+@python-web
+@rubyonrails
+@mysql
+@sql-server
+@javaenterprise
+
+# 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-install-server.ks

@@ -0,0 +1,128 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# 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
+
+# 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
+
+# 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.
+%packages --default
+
+# 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-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+
+# core
+kernel*
+dracut-*
+
+# No desktops
+-cinnamon*
+-enlightenment*
+-gnome-shell
+-gnome-session
+-kde*
+-lightdm-kde
+-lightdm-razorqt
+# Pulls in qt
+-oprofile-gui
+
+-@legacy-fonts
+
+
+## common stuff
+@guest-agents
+@standard
+@core
+@multimedia
+@hardware-support
+
+# Workstation
+@development-libs
+@development-tools
+@c-development
+@rpm-development-tools
+@fedora-packager
+
+# Common server packages
+@mysql
+@sql-server
+@web-server
+
+# Web Server environment
+@haproxy
+@mongodb
+@perl-web
+@python-web
+@php
+@rubyonrails
+@tomcat
+
+# Infrastructure Server
+@directory-server
+@dogtag
+@dns-server
+@freeipa-server
+@ftp-server
+@mail-server
+@network-server
+@printing
+@smb-server
+@virtualization
+@load-balancer
+@ha
+
+@container-management
+@headless-management
+@javaenterprise
+
+# “uservisible” groups we want to offer
+@editors
+@network-server
+@system-tools
+@text-internet
+
+# Things needed for installation
+@anaconda-tools
+
+# Langpacks
+autocorr-*
+hunspell-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end

fedora-install-workstation.ks

@@ -16,17 +16,17 @@
 # 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 --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-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 --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-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)
 # @base got renamed to @standard, but @base is still included by default by pungi.
-%packages --default --nobase
+%packages --default
 
 # 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
@@ -124,7 +124,7 @@ dracut-*
 @sql-server
 @design-suite
 ## Not included yet due to space concerns
-#@jbossas
+#@javaenterprise
 #@milkymist
 #@mingw32
 #@ocaml

fedora-kde-packages.ks

@@ -3,6 +3,7 @@
 @kde-desktop
 @kde-media
 @kde-telepathy
+@networkmanager-submodules
 
 ### The KDE-Desktop
 

fedora-live-base.ks

@@ -193,7 +193,7 @@ systemctl stop mdmonitor.service 2> /dev/null || :
 systemctl stop mdmonitor-takeover.service 2> /dev/null || :
 
 # don't enable the gnome-settings-daemon packagekit plugin
-gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || :
+gsettings set org.gnome.software download-updates 'false' || :
 
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
@@ -280,7 +280,9 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
@@ -301,7 +303,7 @@ rm -f /core*
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then

fedora-live-design-suite.ks

@@ -4,7 +4,7 @@
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
 # Maintainers:
-# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
+# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
 %include fedora-live-desktop.ks
@@ -27,10 +27,12 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-gap
 gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
+gimp-separate+
 gpick
 GREYCstoration-gimp 
 hugin 
@@ -98,33 +100,20 @@ overpass-fonts
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 #Enable categories in Gnome Shell
-app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
+app-folder-categories=['Utilities', 'Games', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'wine-wine', 'Crossover', 'Crossover Games', 'Science', 'Education', 'Universal Access', 'Other']
 FOE
 
-# Add link to the Inkscape Course
+# Add link to lists of tutorials
-cat >> /usr/share/applications/inkscape-course.desktop << FOE
-[Desktop Entry]
-Name=Introduction To Inkscape
-GenericName=Inkscape Course
-Comment=Materials from Máirín Duffy's Inkscape Class
-Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
-Type=Application
-Icon=fedora-logo-icon
-Categories=Graphics;Documentation;
-FOE
-chmod a+x /usr/share/applications/inkscape-course.desktop
-
-# Add link to the list of design tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
 Name=List of design tutorials
-GenericName=Design tutorials
+GenericName=List of Tutorials for Designers
-Comment=List of websites using open source design software
+Comment=Reference of Design Related Tutorials
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
-Icon=applicatons-graphics
+Icon=applications-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
@@ -132,7 +121,7 @@ chmod a+x /usr/share/applications/list-design-tutorials.desktop
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
-EOF
+#EOF
 
 %end
 

fedora-live-desktop.ks

@@ -12,9 +12,9 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 
 
 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.settings-daemon.plugins.updates]
+[org.gnome.software]
-active=false
+download-updates=false
 FOE
 
 # don't run gnome-initial-setup

fedora-live-jam-kde.ks

@@ -33,6 +33,7 @@ alsa-plugins-samplerate
 alsa-plugins-upmix
 alsa-plugins-vdownmix
 a2jmidid
+aj-snapshot
 
 #jack 
 jack-audio-connection-kit
@@ -75,7 +76,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour
+ardour3
 rosegarden4
 seq24
 muse
@@ -121,6 +122,11 @@ lv2-synthv1
 lv2-drumkv1
 lv2-triceratops
 lv2-newtonator
+lv2-x42-plugins
+lv2-fomp-plugins
+lv2-sorcer
+lv2-fabla
+lv2-artyfx-plugins
 
 #dssi
 nekobee-dssi

fedora-live-kde-base.ks

@@ -90,6 +90,12 @@ cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
 autoload=false
 KDEDRC_EOF
 
+# Disable baloo
+cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
+[Basic Settings]
+Indexing-Enabled=false
+BALOO_EOF
+
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]

fedora-live-kde.ks

@@ -28,7 +28,6 @@ calligra
 fuse
 liveusb-creator
 #pavucontrol			# pavucontrol has duplicate functionality with kmix
-#kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
 # kdeedu apps

fedora-live-minimization.ks

@@ -15,11 +15,6 @@
 -coolkey
 -wget
 
-# qlogic firmwares
--ql2100-firmware
--ql2200-firmware
--ql23xx-firmware
-
 # scanning takes quite a bit of space :/
 -xsane
 -xsane-gimp

fedora-live-workstation.ks

@@ -0,0 +1,69 @@
+# Maintained by the Fedora Workstation WG:
+# http://fedoraproject.org/wiki/Workstation
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-base.ks
+%include fedora-workstation-packages.ks
+
+part / --size 6144 
+
+%post
+
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+
+# disable updates plugin
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
+[org.gnome.software]
+download-updates=false
+FOE
+
+# don't run gnome-initial-setup
+mkdir ~liveuser/.config
+touch ~liveuser/.config/gnome-initial-setup-done
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+  # need to move it to anaconda.desktop to make shell happy
+  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
+  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']
+FOE
+
+  # Make the welcome screen show up
+  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
+    mkdir -p ~liveuser/.config/autostart
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
+  fi
+fi
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up auto-login
+cat > /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF
+
+%end

fedora-livecd-desktop.ks

@@ -14,6 +14,10 @@
 -libreoffice-emailmerge
 -libreoffice-math
 
+# remove some other applications
+-gnome-boxes
+-gnome-dictionary
+
 # remove input method things we don't need
 -ibus-typing-booster
 -imsettings
@@ -21,7 +25,6 @@
 
 # Drop the Java plugin
 -icedtea-web
--java-1.7.0-openjdk
 -java-1.8.0-openjdk
 
 # Drop things that pull in perl
@@ -31,6 +34,9 @@
 -foomatic-db-ppds
 -foomatic
 
+# we don't want prelink
+-prelink
+
 # Dictionaries are big
 # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
 # strong preference to giving it a go on #fedora-desktop.
@@ -73,7 +79,6 @@
 -dump
 
 # Drop some system-config things
--system-config-boot
 -system-config-language
 -system-config-rootpassword
 -system-config-services

fedora-livecd-kde.ks

@@ -38,7 +38,6 @@ calligra-stage			# ~3 megs
 #twinkle			# (~10 megs)
 fuse
 liveusb-creator
-#kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 
 # only include kdegames-minimal
 -kdegames

fedora-livecd-mate-compiz.ks

@@ -38,7 +38,6 @@ midori
 
 # Drop the Java plugin
 -icedtea-web
--java-1.7.0-openjdk
 -java-1.8.0-openjdk
 
 # Drop things that pull in perl

fedora-livecd-security.ks

@@ -25,7 +25,7 @@ part / --size 10240
 @xfce-desktop
 @xfce-apps
 
-# Security tools (not ready at the moment)
+# Security tools
 @security-lab
 security-menus
 
@@ -49,10 +49,7 @@ gnome-keyring-pam
 -man-pages-*
 
 # drop some system-config things
--system-config-boot
-#-system-config-network
 -system-config-rootpassword
-#-system-config-services
 -policycoreutils-gui
 
 # exclude some packages to save some space
@@ -79,9 +76,6 @@ gnome-keyring-pam
 -pads
 -pdfcrack
 -picviz-gui
--prelude-lml
--prelude-manager
--prewikka
 -proxychains
 -pyrit
 -raddump
@@ -89,13 +83,15 @@ gnome-keyring-pam
 -safecopy
 -samdump2
 -scalpel
--sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
 -tripwire
 -wipe
 
+# Is not available for OpenVAS-7. No longer supported by upstream.
+-openvas-client 
+
 %end
 
 %post

fedora-livecd-soas.ks

@@ -26,8 +26,8 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick 10 (Unknown)
+Sugar on a Stick 11 (Unknown)
-Fedora release 20 (Rawhide)
+Fedora release 21 (Rawhide)
 EOF
 
 # Add our activities to the favorites
@@ -51,6 +51,7 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
+org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
 org.sugarlabs.AbacusActivity

fedora-livedvd-games.ks

@@ -91,6 +91,7 @@ lordsawar
 lure
 machineball
 nethack
+openlierox
 pachi
 pioneers
 quarry
@@ -149,6 +150,7 @@ pingus
 # puzzles (small)
 
 escape
+gbrainy
 magicor
 mirrormagic
 pipenightdreams

fedora-livedvd-robotics.ks

@@ -78,7 +78,6 @@ firefox
 -ntsysv
 
 # Drop some system-config things
--system-config-boot
 -system-config-language
 -system-config-network
 -system-config-rootpassword
@@ -103,9 +102,9 @@ disable-lock-screen=true
 FOE
 
 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.settings-daemon.plugins.updates]
+[org.gnome.software]
-active=false
+download-updates=false
 FOE
 
 # make the installer show up

fedora-livedvd-scientific-kde.ks

@@ -27,8 +27,8 @@ scilab-doc
 
 # sagemath
 # BZ #1006230 should fix this
-sagemath
+#sagemath
-sagemath-notebook
+#sagemath-notebook
 
 #Devel tools
 

fedora-lxde-packages.ks

@@ -12,7 +12,10 @@
 @lxde-apps
 @lxde-media
 @lxde-office
-@firefox
+@networkmanager-submodules
+
+# FIXME: can be omitted once comps is updated
+midori
 
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -35,9 +38,6 @@ metacity
 #-man-pages-*
 #-words
 
-# use ssmtp
-ssmtp
-
 # save some space
 -autofs
 -acpid
@@ -50,13 +50,9 @@ ssmtp
 -stix-fonts
 -ibus-typing-booster
 -xscreensaver-extras
--wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
+#-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
-
-# FIXME: can be removed once mtpaint is gone from lxde-apps in comps
--mtpaint
 
 # drop some system-config things
--system-config-boot
 #-system-config-language
 -system-config-network
 -system-config-rootpassword

fedora-mate-packages.ks

@@ -1,6 +1,8 @@
 %packages
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
+-ConsoleKit                 # ConsoleKit is deprecated
+-ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
 @mate
 compiz
@@ -19,6 +21,7 @@ emerald
 fusion-icon
 fusion-icon-gtk
 @libreoffice
+@networkmanager-submodules
 
 # 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.

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

@@ -41,6 +41,9 @@ lightdm-gtk
 # enable for testing in the F17 dev cycle
 @input-methods
 
+# Needed for wifi, bluetooth and WWAN connection support
+@networkmanager-submodules
+
 # == Platform Components ==
 # from http://wiki.sugarlabs.org/go/0.94/Platform_Components
 alsa-plugins-pulseaudio

fedora-workstation-packages.ks

@@ -0,0 +1,70 @@
+%packages
+@firefox
+@gnome-desktop
+@libreoffice
+@networkmanager-submodules
+
+#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
+-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

@@ -12,6 +12,7 @@
 
 %packages
 
+@networkmanager-submodules
 @xfce-desktop
 @xfce-apps
 @xfce-extra-plugins
@@ -38,7 +39,6 @@ gnome-keyring-pam
 #-man-pages-*
 
 # drop some system-config things
--system-config-boot
 -system-config-network
 -system-config-rootpassword
 #-system-config-services