making cloud images is easier if we include the base

Revert "this breaks compose, need to revert"

This reverts commit d6a2350a39.

.sparkleshare

@@ -1 +0,0 @@
-d6afc629dc9311ebd79b4cedb2775531065ecb05

SparkleShare.txt

@@ -1,9 +0,0 @@
-Congratulations, you've successfully created a SparkleShare repository!
-
-Any files you add or change in this folder will be automatically synced to 
-ssh://luya@git.fedorahosted.org/git/spin-kickstarts.git and everyone connected to it.
-
-SparkleShare is an Open Source software program that helps people collaborate and 
-share files. If you like what we do, consider buying us a beer: http://www.sparkleshare.org/
-
-Have fun! :)

atomic-installer/lorax-configure-repo.tmpl

@@ -1,8 +0,0 @@
-## Lorax template to configure Anaconda to use the local OSTree
-## repository on disk.
-
-<%page args="ostree_osname, ostree_ref"/>
-append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
-append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
-

atomic-installer/lorax-embed-repo.tmpl

@@ -1,11 +0,0 @@
-## Lorax template to embed an OSTree repository into the installer.iso
-## and configure an interactive installer use to look for it.
-##
-## Note that we pull with depth=0 to only get *one* commit into the
-## ISO, because we obviously don't want the full history.
-
-<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
-runcmd mkdir -p ${workdir}/iso-graft/content/repo
-runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
-runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
-runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}

custom/fedora-livedvd-haskell.ks

@@ -1,4 +1,4 @@
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 part / --size 6000
 

custom/qa-test-day.ks

@@ -3,7 +3,7 @@
 # Contact QA team if you have any improvements for this kickstart:
 # https://fedoraproject.org/wiki/QA
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 
 ## System configuration
@@ -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/00-test-day.js
+cat << FOE >> $PREFDIR/test-day.js
 pref("startup.homepage_welcome_url","");
 pref("startup.homepage_override_url","");
 pref("browser.rights.3.shown", true);

fedora-arm-base.ks

@@ -7,10 +7,6 @@ firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 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
 
@@ -25,37 +21,33 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 @dial-up
 
 kernel
-
-dracut-config-generic
+kernel-lpae
 
 chrony
 arm-boot-config
 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
 
 # install uboot images
-uboot-images-armv7
+uboot-beagle
+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 ARM disk image"
-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."

fedora-arm-desktop-vfat.ks

@@ -0,0 +1,12 @@
+%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

@@ -0,0 +1,12 @@
+%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

@@ -0,0 +1,13 @@
+%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,8 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
+%include fedora-arm-partitioning.ks
 
-part / --size=5000 --fstype ext4
+part / --size=4000 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-lxde-vfat.ks

@@ -0,0 +1,11 @@
+%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,6 +1,7 @@
 %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

@@ -0,0 +1,13 @@
+%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,6 +1,7 @@
 %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,19 +1,8 @@
 %include fedora-arm-base.ks
+%include fedora-arm-vfat-partitioning.ks
 
-# server defaults to xfs for / so lets do so on arm also
-part / --size=3000 --fstype xfs
-
-%packages
--@dial-up
-# install the default groups for the server evironment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@container-management
-@domain-client
--initial-setup-gui
--generic-release*
-%end
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
 
 %post
 

fedora-arm-minimal.ks

@@ -1,15 +1,8 @@
 %include fedora-arm-base.ks
+%include fedora-arm-partitioning.ks
 
-part /boot --size=300 --fstype ext3
-part swap --size=256 --fstype swap
-part / --size=1200 --fstype ext4
-
-%packages
--@standard
--@dial-up
--initial-setup-gui
--generic-release*
-%end
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
 
 %post
 

fedora-arm-partitioning.ks

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

fedora-arm-soas-vfat.ks

@@ -0,0 +1,11 @@
+%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,6 +1,7 @@
 %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

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

fedora-arm-workstation.ks

@@ -1,12 +0,0 @@
-%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,3 +6,15 @@
 @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

@@ -0,0 +1,11 @@
+%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,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-part / --size=3500 --fstype ext4
+%include fedora-arm-partitioning.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-cloud-atomic-pxetolive.ks

@@ -1,31 +0,0 @@
-# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host
-# https://fedoraproject.org/wiki/Changes/AtomicHost
-
-lang en_US.UTF-8
-keyboard us
-timezone America/New_York
-zerombr
-clearpart --all --initlabel
-rootpw --lock --iscrypted locked
-user --name=none
-bootloader --timeout=1
-network --bootproto=dhcp --device=link --activate
-# We are only able to install atomic with separate /boot partition currently
-part / --fstype="ext4" --size=6000
-part /boot --size=500 --fstype="ext4"
-shutdown
-services --disabled=docker-storage-setup,network
-services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
- 
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
- 
-%post
-
-# Ensure the root password is locked, we use cloud-init
-passwd -l root
-userdel -r none
-
-# We copy content of separate /boot partition to root part when building live squashfs image,
-# and we don't want systemd to try to mount it when pxe booting
-cat /dev/null > /etc/fstab
-%end

fedora-cloud-atomic-vagrant.ks

@@ -1,28 +0,0 @@
-# Like the Atomic cloud image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-cloud-atomic.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-user --name=vagrant --password=vagrant
-
-%post --erroronfail
-
-# Work around cloud-init being both disabled and enabled; need
-# to refactor to a common base.
-systemctl mask cloud-init cloud-init-local cloud-config cloud-final
-
-# Vagrant setup
-sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
-sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
-mkdir -m 0700 -p ~vagrant/.ssh
-cat > ~vagrant/.ssh/authorized_keys << EOKEYS
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOKEYS
-chmod 600 ~vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant ~vagrant/.ssh/
-
-%end
-

fedora-cloud-atomic.ks

@@ -1,119 +0,0 @@
-# Fedora Atomic is a cloud-focused spin implementing the Project
-# Atomic patterns.  Note that this replicates the same tree which can
-# now be installed on bare metal.
-
-# This image allocates most space to an LVM-managed thin pool
-# dedicated for Docker containers, and uses docker-storage-setup to
-# dynamically resize storage on boot.
-
-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"
-
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --disabled=network
-services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-# Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="ext4"
-part pv.01 --grow
-volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
-
-# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
-
-reboot
-
-%post --erroronfail
-# See https://github.com/projectatomic/rpm-ostree/issues/42
-ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
-
-# 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
-
-# We can lead the way with the internal DHCP, see
-# https://lists.fedoraproject.org/pipermail/cloud/2015-March/005119.html
-echo "dhcp=internal" >> /etc/NetworkManager/NetworkManager.conf
-
-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
-
-# 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 "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 "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-vagrant.ks

@@ -1,57 +0,0 @@
-# Like the Cloud Base image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-cloud-base.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-# So, to be clear, this gaping security hole is an integral part of how
-# Vagrant works - These images are _not_ supposed to be run in any public-
-# Internet facing way - They are for use on developer setups, almost always
-# with NAT
-user --name=vagrant --password=vagrant
-
-# Suggestion from @purpleidea that most/many vagrant boxes also set root PW
-# to "vagrant" for ease of use.  Again, see comments above.
-rootpw vagrant
-
-# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
-# even on VirtualBox virt, we get a primary network device with "eth0" as the name
-# This simplifies things and allows a single disk image for both supported Vagrant
-# platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
-
-%packages
-# The default koji Vagrantfile configuration uses rsync to sync files between
-# the vagrant host and the guest.  It uses yum to verify that rsync is present
-# and/or install it if it is not.  It will fail without adding the yum compat
-# layer for dnf
-# TODO: Teach vagrant about dnf
-dnf-yum
-%end
-
-%post --erroronfail
-
-# Work around cloud-init being both disabled and enabled; need
-# to refactor to a common base.
-systemctl mask cloud-init cloud-init-local cloud-config cloud-final
-
-# Vagrant setup
-sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
-sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
-mkdir -m 0700 -p ~vagrant/.ssh
-cat > ~vagrant/.ssh/authorized_keys << EOKEYS
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOKEYS
-chmod 600 ~vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant ~vagrant/.ssh/
-
-# Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
-mkdir -m 0700 -p /root/.ssh
-cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys
-chmod 600 /root/.ssh/authorized_keys
-chown -R root:root /root/.ssh
-
-%end
-

fedora-cloud-base.ks

@@ -1,4 +1,4 @@
-# This is a basic Fedora 21 spin designed to work in OpenStack and other
+# This is a basic Fedora 20 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
@@ -11,7 +11,6 @@
 # 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.
 
-cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -19,43 +18,65 @@ timezone --utc Etc/UTC
 auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
-user --name=none
 
-firewall --disabled
+# this is actually not used, but a static firewall
+# matching these rules is generated below.
+firewall --service=ssh
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-network --bootproto=dhcp --device=link --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
+part / --size 2048 --fstype ext4
 
 %include fedora-repo.ks
 
+
 reboot
 
 # Package list.
-# FIXME: instLangs does not work, so there's a hack below
-# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-%packages --instLangs=en
+%packages
+@core
+grubby
 
-kernel-core
-@^cloud-server-environment
+# cloud-init does magical things with EC2 metadata, including provisioning
+# a user account with ssh keys.
+cloud-init
 
-# rescue mode generally isn't useful in the cloud context
+# 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
+
+# Basic firewall. If you're going to rely on your cloud service's
+# security groups you can remove this.
+iptables-services
+
+# 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
 
@@ -74,8 +95,8 @@ 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 "\troot (hd0)" >> /boot/grub/grub.conf
+  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
   echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
   echo
 done
@@ -89,8 +110,6 @@ 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.
@@ -102,36 +121,46 @@ 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."
-dnf -C -y erase linux-firmware
+yum -C -y remove linux-firmware
 
-# Remove firewalld; was supposed to be optional in F18+, but is pulled in
-# in install/image building.
+# Remove firewalld; was supposed to be optional in F18+, but is required to
+# be present for install/image building.
 echo "Removing firewalld."
-# FIXME! clean_requirements_on_remove is the default with DNF, but may
-# not work when package was installed by Anaconda instead of command line.
-# Also -- check if this is still even needed with new anaconda -- disabled
-# firewall should _not_ pull in this package.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-dnf -C -y erase "firewalld*"
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+# Non-firewalld-firewall
+echo -n "Writing static firewall"
+cat <<EOF > /etc/sysconfig/iptables
+# Simple static firewall loaded by iptables.service. Replace
+# this with your own custom rules, run lokkit, or switch to 
+# shorewall or firewalld as your needs dictate.
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
+-A INPUT -j REJECT --reject-with icmp-host-prohibited
+-A FORWARD -j REJECT --reject-with icmp-host-prohibited
+COMMIT
+EOF
+echo .
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y erase authconfig
-
-# instlang hack. (Note! See bug referenced above package list)
-find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
-localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
-# this will kill a live system (since it's memory mapped) but should be safe offline
-mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
-awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
+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
@@ -142,17 +171,15 @@ NAutoVTs=0' /etc/systemd/logind.conf
 
 echo -n "Network fixes"
 # initscripts don't like this file to be missing.
-# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
 cat > /etc/sysconfig/network << EOF
 NETWORKING=yes
 NOZEROCONF=yes
-DEVTIMEOUT=10
 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
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
 
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
@@ -160,7 +187,6 @@ DEVICE="eth0"
 BOOTPROTO="dhcp"
 ONBOOT="yes"
 TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
 EOF
 
 # generic localhost names
@@ -192,40 +218,13 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/random-seed
 
-echo "Cleaning old dnf repodata."
-# FIXME: clear history?
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
-truncate -c -s 0 /var/log/dnf.rpm.log
+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*
-
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
-# FIXME: is this still needed?
 echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-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

fedora-cloud-bigdata.ks

@@ -1,221 +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
-
-fedora-release-cloud
-
-kernel-core
-@core
-@cloud-server
-
-# Needed initially, but removed below.
-firewalld
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--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 .
-
-# 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*
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
-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

@@ -1,213 +0,0 @@
-# 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
-@cloud-server
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Needed initially, but removed below.
-firewalld
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--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 .
-
-# 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*
-
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
-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

@@ -0,0 +1,31 @@
+%packages
+@firefox
+@gnome-desktop
+@libreoffice
+
+# 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
+
+# Similarly, there was also some debate about removing rsyslog from @standard
+# (since much of its functionality is provided by journald now), but it's
+# not going to happen for f20 either, so drop it here for now.
+# https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
+-rsyslog
+
+# Remove a few apps that are being presented as featured apps in
+# gnome-software
+-transmission-gtk
+-simple-scan
+-gnome-photos
+-gnome-maps
+-gnome-weather
+
+%end

fedora-docker-base.ks

@@ -1,80 +0,0 @@
-# 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.
-#
-###  Hacking on this image ###
-# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
-# but you can run imagefactory locally too.
-#
-# To do so, testing local changes, first you'll need a TDL file.  I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# 
-# Then, once you have imagefactory and imagefactory-plugins installed, run:
-# 
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
-#
-
-cmdline
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
-
-keyboard us
-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
-rootfiles
-vim-minimal
-dnf
-dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
-#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
-
-# remove the user anaconda forces us to make
-userdel -r none
-
-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
-
-#Setup locale properly
-localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
-
-rm -rf /var/cache/yum/*
-rm -f /tmp/ks-script*
-
-#Make it easier for systemd to run in Docker container
-cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
-sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
-
-#Mask mount units and getty service so that we don't get login prompt
-systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
-
-rm -f /etc/machine-id
-
-%end

fedora-i386-cloud.ks

@@ -0,0 +1,20 @@
+%include fedora-cloud-base.ks
+
+# Package list.
+%packages
+kernel-PAE
+
+%end
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel-PAE
+EOF
+fi
+%end

fedora-install-cloud.ks

@@ -1,93 +0,0 @@
-# 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
-
-# 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 --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-
-# 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 --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-
-# 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* would match generic-jms-ra, so don't 'simplify' this
--generic-logos*
--generic-release*
--GConf2-dbus*
--bluez-gnome
--community-mysql*
-# jruby used to be in this list, but springframework-context explicitly
-# requires it, not just 'any ruby implemention' - please check for things
-# on the image that require mvn(org.jruby:jruby) before adding jruby to
-# this list again - adamw 2014/09
-#-jruby
-
-# core
-kernel*
-dracut-*
-
-
-# Things needed for installation
-@anaconda-tools
-fedora-productimg-cloud
--fedora-productimg-server
--fedora-productimg-workstation
-
-# 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-*
-hunspell-*
-hyphen-*
-man-pages-*
--gimp-help-*
-
-# Removals
--PackageKit-zif
--zif
-%end

fedora-install-fedora.ks

@@ -16,21 +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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
-repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+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
-
--fedora-productimg-cloud
-fedora-productimg-server
--fedora-productimg-workstation
+%packages --default --nobase
 
 # 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
@@ -41,92 +37,113 @@ fedora-productimg-server
 -kernel-tools*
 -syslog-ng*
 -astronomy-bookmarks
--generic-logos*
--generic-release*
+-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-*
 
-# No desktops
--cinnamon*
--enlightenment*
--gnome-shell
--gnome-session
--kde*
--lightdm-kde
--lightdm-razorqt
-# Pulls in qt
--oprofile-gui
-
--@legacy-fonts
-
--@multimedia
+# 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
 
-# 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
-@server-hardware-support
+## GNOME
+@firefox
+@gnome-desktop
+@epiphany
+@libreoffice
+@gnome-games
 
-# Common server packages
-@mysql
-@sql-server
+## 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
-
-# Web Server environment
-@haproxy
 @mongodb
 @perl-web
-@python-web
 @php
+@python-web
 @rubyonrails
-@tomcat
-
-# Infrastructure Server
-@directory-server
-@dogtag
-@dns-server
-@freeipa-server
-@ftp-server
-@mail-server
-@network-server
-@printing
-@smb-server
-@virtualization
-@load-balancer
-@ha
-
-@javaenterprise
-
-# “uservisible” groups we want to offer
-@editors
-@network-server
-@system-tools
-@text-internet
+@mysql
+@sql-server
+@design-suite
+## Not included yet due to space concerns
+#@jbossas
+#@milkymist
+#@mingw32
+#@ocaml
+#@robotics-suite
+#@electronic-lab
 
 # Things needed for installation
 @anaconda-tools
-fedora-productimg-server
 
 # Langpacks
 autocorr-*
+eclipse-nls-*
 hunspell-*
+hyphen-*
+calligra-l10n-*
+kde-l10n-*
+libreoffice-langpack-*
 man-pages-*
+mythes-*
 -gimp-help-*
 
 # Removals

fedora-install-workstation.ks

@@ -1,51 +0,0 @@
-# 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-
-# 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 --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-
-%include fedora-workstation-packages.ks
-
-# Package manifest for the compose.  Uses repo group metadata to translate groups.
-# (default groups for the configured repos are added by --default)
-# @base got renamed to @standard, but @base is still included by default by pungi.
-%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*
--astronomy-bookmarks
--generic*
-
-# core
-kernel*
-
-# Things needed for installation
-@anaconda-tools
--fedora-productimg-cloud
--fedora-productimg-server
-fedora-productimg-workstation
-
-%end

fedora-kde-packages.ks

@@ -2,9 +2,7 @@
 @kde-apps
 @kde-desktop
 @kde-media
-@kde-office
 @kde-telepathy
-@networkmanager-submodules
 
 ### The KDE-Desktop
 
@@ -17,9 +15,5 @@ mariadb-embedded
 mariadb-libs
 mariadb-server
 
-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
 %end
 

fedora-live-base.ks

@@ -14,7 +14,7 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-part / --size 4096 --fstype ext4
+part / --size 3072 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
 %include fedora-repo.ks
@@ -44,8 +44,8 @@ memtest86+
 anaconda
 @anaconda-tools
 
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
-aajohan-comfortaa-fonts
+# Make live images easy to shutdown and the like in libvirt
+qemu-guest-agent
 
 %end
 
@@ -77,6 +77,9 @@ 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
@@ -156,6 +159,12 @@ 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
@@ -184,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.software download-updates 'false' || :
+gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || :
 
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
@@ -269,18 +278,8 @@ 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)
-basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
@@ -298,20 +297,11 @@ rm -f /core*
 # convince readahead not to collect
 # FIXME: for systemd
 
-# forcibly regenerate fontconfig cache (so long as this live image has
-# fontconfig) - see #1169979
-if [ -x /usr/bin/fc-cache ] ; then
-   fc-cache -f
-fi
-
-echo 'File created by kickstart. See systemd-update-done.service(8).' \
-    | tee /etc/.updated >/var/.updated
-
 %end
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+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

@@ -0,0 +1,144 @@
+# fedora-design-suite.ks
+# Based on Live Desktop
+# Description:
+# - A Spin targeted towards professional designers
+# Website: http://fedoraproject.org/wiki/Design_Suite
+# Maintainers:
+# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
+# - Previous maintainer Sebastian Dziallas
+
+%include fedora-live-desktop.ks
+
+#DVD size partition
+part / --size 8192
+
+%packages
+
+# graphics
+blender
+bluefish 
+#cinepaint
+cmyktool
+darktable
+dia
+entangle
+fontforge
+font-manager 
+gimp
+gimp-*-plugin
+gimp-data-extras
+gimp-high-pass-filter
+gimp-normalmap
+gimp-resynthesizer
+gpick
+GREYCstoration-gimp 
+hugin 
+mypaint
+inkscape
+nautilus-image-converter
+optipng
+phatch
+screenruler
+simple-scan
+scribus
+colord-extra-profiles 
+synfigstudio
+xournal
+
+# office
+vym
+pdfshuffler  
+
+# internet
+filezilla
+
+# audio & video
+audacity
+pitivi
+
+# system
+# gtk-recordmydesktop # dropped for space (#887991)
+# network-manager-applet #part of Gnome Desktop
+
+# fonts
+aajohan-comfortaa-fonts
+adobe-source-sans-pro-fonts
+campivisivi-titillium-fonts
+lato-fonts
+overpass-fonts
+
+# removal of duplicated and unneeded applications
+-gnome-boxes
+-gthumb
+-eog
+-gnome-photos
+-rdesktop
+
+# Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-telnet
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+
+%end
+
+%post
+#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']
+#Enable categories in Gnome Shell
+app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
+FOE
+
+# Add link to the Inkscape Course
+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
+
+<<<<<<< HEAD
+=======
+# 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
+Comment=List of websites using open source design software
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+Type=Application
+Icon=applications-graphics
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/list-design-tutorials.desktop
+
+>>>>>>> 6d05550... design: fix link for tutorials
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+%end
+

fedora-live-design_suite.ks

@@ -1,141 +0,0 @@
-# fedora-design-suite.ks
-# Based on Live Workstation
-# Description:
-# - A Spin targeted towards professional designers
-# Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainers:
-# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Previous maintainer Sebastian Dziallas
-
-%include fedora-live-workstation.ks
-
-#DVD size partition
-part / --size 8192
-
-%packages
-# graphics
-blender
-LuxRender-blender
-YafaRay-blender
-bluefish 
-colord-extra-profiles
-darktable
-dia
-entangle
-fontforge
-font-manager 
-gimp
-gimp-elsamuko
-gimp-*-plugin
-gimp-data-extras
-gimp-gap
-gimp-paint-studio
-gimp-high-pass-filter
-gimp-normalmap
-gimp-resynthesizer
-gimp-separate+
-gpick
-GraphicsMagick
-gmic-gimp
-hugin 
-ImageMagick
-inkscape
-inkscape-sozi
-inkscape-table
-mypaint
-nautilus-image-converter
-optipng
-phatch
-screenruler
-simple-scan
-scribus
-shutter
-synfigstudio
-xournal
-
-# office
-vym
-pdfmod
-pdfshuffler  
-
-# internet
-filezilla
-sparkleshare
-sshpass
-
-# audio & video
-audacity
-pitivi
-
-# fonts
-aajohan-comfortaa-fonts
-adobe-source-sans-pro-fonts
-campivisivi-titillium-fonts
-lato-fonts
-open-sans-fonts
-overpass-fonts
-
-# removal of unneeded applications
--gnome-boxes
--gthumb
--eog
--gnome-photos
--rdesktop
-
-%end
-
-%post
-#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', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
-FOE
-
-# Add link to lists of tutorials
-cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
-[Desktop Entry]
-Name=List of design tutorials
-GenericName=List of Tutorials for Designers
-Comment=Reference of Design Related Tutorials
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
-Type=Application
-Icon=applications-graphics
-Categories=Graphics;Documentation;
-FOE
-chmod a+x /usr/share/applications/list-design-tutorials.desktop
-
-# Add information about Fedora Design Suite
-cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
-[Desktop Entry]
-Name=Design Suite Info
-GenericName=About Design Suite
-Comment=Wiki page of Design Suite
-Name=About Design Suite
-GenericName=About Design Suite 
-Comment=Wiki page of Design Suite
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
-Type=Application
-Icon=applications-internet
-Categories=Documentation;
-FOE
-chmod a+x /usr/share/applications/fedora-design-suite.desktop
-
-# Add information about Fedora Design Team
-cat >> /usr/share/applications/fedora-design-team.desktop << FOE
-[Desktop Entry]
-Name=Design Team Info
-GenericName=About Design Team 
-Name=About Design Team
-GenericName=About Design Team Wiki Page
-Comment=Wiki page of Design Team
-Exec=xdg-open http://fedoraproject.org/wiki/Design
-Type=Application
-Icon=applications-internet
-Categories=Documentation;
-FOE
-chmod a+x /usr/share/applications/fedora-design-team.desktop
-
-# rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-%end

fedora-live-desktop.ks

@@ -1,24 +1,20 @@
-# Maintained by the Fedora Workstation WG:
-# http://fedoraproject.org/wiki/Workstation
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-workstation-packages.ks
+%include fedora-desktop-packages.ks
 
-part / --size 6144 
+part / --size 4096
 
 %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
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=false
 FOE
 
 # don't run gnome-initial-setup
@@ -34,7 +30,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', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+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
@@ -43,11 +39,6 @@ FOE
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
   fi
-
-  # Copy Anaconda branding in place
-  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
-    cp -a /usr/share/lorax/product/* /
-  fi
 fi
 
 # rebuild schema cache with any overrides we installed

fedora-live-jam-kde.ks

@@ -76,7 +76,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour3
+ardour
 rosegarden4
 seq24
 muse
@@ -124,9 +124,6 @@ lv2-triceratops
 lv2-newtonator
 lv2-x42-plugins
 lv2-fomp-plugins
-lv2-sorcer
-lv2-fabla
-lv2-artyfx-plugins
 
 #dssi
 nekobee-dssi
@@ -199,12 +196,12 @@ thunderbird
 %post
 
 #setup kickoff favorites
-/bin/mkdir -p /etc/skel/.config
+/bin/mkdir -p /etc/skel/.kde/share/config
 
-JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<EOF  >> /etc/skel/.config/kickoffrc
+cat <<EOF  >> /etc/skel/.kde/share/config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 EOF

fedora-live-kde-base.ks

@@ -13,16 +13,16 @@ DESKTOP="KDE"
 DISPLAYMANAGER="KDE"
 EOF
 
-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
+include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="Adwaita"
+gtk-theme-name="oxygen-gtk"
 EOF
 mkdir -p /root/.config/gtk-3.0
 cat > /root/.config/gtk-3.0/settings.ini << EOF
 [Settings]
-gtk-theme-name = Adwaita
+gtk-theme-name = oxygen-gtk
 EOF
 
 # add initscript
@@ -40,22 +40,17 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 
 # set up autologin for user liveuser
-if [ -f /etc/sddm.conf ]; then
-sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
-else
-cat > /etc/sddm.conf << SDDM_EOF
-[Autologin]
-User=liveuser
-Session=plasma.desktop
-SDDM_EOF
-fi
+sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
+
+# set up user liveuser as default user and preselected user
+sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
+sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
 
 # add liveinst.desktop to favorites menu
-mkdir -p /home/liveuser/.config/
-cat > /home/liveuser/.config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
@@ -80,16 +75,20 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates
-sed -i \
-    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+# Disable the update notifications of apper 
+cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
+[CheckUpdate]
+autoUpdate=0
+distroUpgrade=0
+interval=0
+APPER_EOF
 
-# Disable baloo
-cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
-[Basic Settings]
-Indexing-Enabled=false
-BALOO_EOF
+# Disable some kded modules
+# apperd: http://bugzilla.redhat.com/948099
+cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
+[Module-apperd]
+autoload=false
+KDEDRC_EOF
 
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
@@ -97,10 +96,24 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
+# Disable nepomuk
+cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
+[Basic Settings]
+Start Nepomuk=false
+
+[Service-nepomukfileindexer]
+autostart=false
+NEPOMUK_EOF
+
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 
+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
 EOF
 
 %end

fedora-live-kde.ks

@@ -2,7 +2,7 @@
 #
 # Description:
 # - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
-#   see fedora-livecd-kde.ks for the default 1.4 GiB version
+#   see fedora-livecd-kde.ks for the default 1 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -22,14 +22,35 @@ kde-wallpapers
 
 # Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
+calligra
 #kdeartwork			# only include some parts of kdeartwork
+#twinkle			# (~10 megs)
 fuse
 liveusb-creator
 #pavucontrol			# pavucontrol has duplicate functionality with kmix
 krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
 # kdeedu apps
-@kde-education
+blinken
+kalzium
+kanagram
+kgeography
+khangman
+kiten
+klettres
+ktouch
+kturtle
+kwordquiz
+parley
+step
+marble
+kstars
+kalgebra
+kbruch
+kig
+kmplot
+rocs
+cantor
 
 # Cantor backends
 cantor-R		# Cantor R backend, built against R-core at compile time

fedora-live-mate-compiz.ks

@@ -5,7 +5,7 @@
 %include fedora-live-base.ks
 %include fedora-mate-packages.ks
 
-part / --size 6144 
+part / --size 4096 
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -19,6 +19,7 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 

fedora-live-minimization.ks

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

fedora-livecd-desktop.ks

@@ -0,0 +1,114 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-desktop.ks
+%include fedora-live-minimization.ks
+
+%packages
+# reduce the office suite in size
+-planner
+-libreoffice-xsltfilter
+-libreoffice-pyuno
+-libreoffice-emailmerge
+-libreoffice-math
+
+# remove some other applications
+-gnome-boxes
+-gnome-dictionary
+
+# remove input method things we don't need
+-ibus-typing-booster
+-imsettings
+-imsettings-gsettings
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.7.0-openjdk
+-java-1.8.0-openjdk
+
+# Drop things that pull in perl
+-linux-atm
+
+# No printing
+-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.
+# also see http://bugzilla.gnome.org/681084
+-aspell-*
+-man-pages*
+-words
+
+# Help and art and fonts can be big, too
+-evolution-help
+-desktop-backgrounds-basic
+-*backgrounds-extras
+-stix-fonts
+
+# Legacy and cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-nano
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-telnet
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+-rmt
+-talk
+-lftp
+-tcpdump
+-dump
+
+# Drop some system-config things
+-system-config-boot
+-system-config-language
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+
+# These things are cut purely for space reasons
+-aisleriot
+-brasero
+-brasero-nautilus
+-bijiben
+-gnome-system-log
+-deja-dup
+-eog
+-gnu-free-mono-fonts
+-gnu-free-sans-fonts
+-gnu-free-serif-fonts
+-uboot-tools
+-dtc
+
+# Without gnu freefonts, the lack of Malayalam coverage is
+# a problem in anaconda (#977764)
+lohit-malayalam-fonts
+
+%end
+
+%post
+
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end

fedora-livecd-kde.ks

@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -19,6 +19,7 @@ part / --size=4096
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
+-scribus			# scribus is too big for the live images
 -kdeartwork-screensavers	# screensavers are not needed on live images
 #-ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
@@ -27,9 +28,14 @@ part / --size=4096
 #-kdeplasma-addons		# ~16 megs
 #-krusader			# ~4 megs
 
-# Additional packages that are not default in kde-* groups, but useful
+# Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
+-calligra			# don't include whole calligra, just parts of it
+calligra-words
+calligra-sheets			# ~1 megs
+calligra-stage			# ~3 megs
 #kdeartwork			# only include some parts of kdeartwork
+#twinkle			# (~10 megs)
 fuse
 liveusb-creator
 
@@ -40,11 +46,11 @@ kdegames-minimal
 ### space issues
 
 # fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
--naver-nanum-gothic-fonts		# Korean
--vlgothic-fonts				# Japanese
--adobe-source-han-sans-cn-fonts		# simplified Chinese
--adobe-source-han-sans-twhk-fonts	# traditional Chinese
+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
 
 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
@@ -59,14 +65,8 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 # save some space (from @standard)
 -make
 
-# admin-tools
+# save space (it pulls in gdisk/udisks2/libicu)
 -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

@@ -0,0 +1,81 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-mate-compiz.ks
+%include fedora-live-minimization.ks
+
+%packages
+# First, no office
+-planner
+
+# Drop things for size
+-firefox
+-@libreoffice
+
+# A web browser would be nice for a live cd
+midori
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.7.0-openjdk
+-java-1.8.0-openjdk
+
+# Drop things that pull in perl
+-linux-atm
+
+# No printing
+-foomatic-db-ppds
+-foomatic
+
+# 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.
+# also see http://bugzilla.gnome.org/681084
+-aspell-*
+-man-pages*
+-words
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+-desktop-backgrounds-basic
+-*backgrounds-extras
+
+# Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-nano
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+
+# Drop some system-config things
+-system-config-boot
+-system-config-language
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+
+%end
+
+%post
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end
+

fedora-livecd-mate_compiz.ks

@@ -1,82 +0,0 @@
-# Desktop with customizations to fit in a CD (package removals, etc.)
-# Maintained by the Fedora Desktop SIG:
-# http://fedoraproject.org/wiki/SIGs/Desktop
-# mailto:desktop@lists.fedoraproject.org
-
-%include fedora-live-mate_compiz.ks
-%include fedora-live-minimization.ks
-
-%packages
-
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-mate-netspeed
-mate-themes-extras
-
-# more backgrounds
-f22-backgrounds-mate
-f21-backgrounds-extras-base
-f21-backgrounds-extras-mate
-
-# system tools
-system-config-printer
-system-config-printer-applet
-
-# office
-@libreoffice
-
-# dsl tools
-rp-pppoe
-
-# audio video
-parole
-exaile
-PackageKit-gstreamer-plugin
-
-# blacklist applications who breaks mate desktop
--audacious
-
-# Drop things for size
--@3d-printing
--brasero
--bluez
--bluez-cups
--colord
--fedora-icon-theme
--GConf2
--gnome-bluetooth-libs
--gnome-icon-theme
--gnome-icon-theme-symbolic
--gnome-software
--gnome-themes
--gnome-themes-standard
--gnome-user-docs
-
--@mate-applications
--mate-icon-theme-faenza
--NetworkManager-bluetooth
-
-# Drop oversized fonts that aren't needed
-
-# Drop things that pull in perl
-
-# 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.
-# also see http://bugzilla.gnome.org/681084
-
-# Help and art can be big, too
--gnome-user-docs
--evolution-help
-
-# Legacy cmdline things we don't want
--telnet
-
-%end
-
-%post
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
-%end

fedora-livecd-security.ks

@@ -24,14 +24,15 @@ part / --size 10240
 %packages
 @xfce-desktop
 @xfce-apps
+#@xfce-extra-plugins
+#@xfce-media
+#@xfce-office
+#@firefox
 
-# Security tools
+# Security tools (not ready at the moment)
 @security-lab
 security-menus
 
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
 # save some space
 -autofs
 -acpid
@@ -40,16 +41,13 @@ gnome-keyring-pam
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
--gnumeric
--foomatic-db-ppds
--foomatic
--stix-fonts
--ibus-typing-booster
--xfce4-sensors-plugin
 -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
@@ -75,6 +73,10 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
+-picviz-gui
+-prelude-lml
+-prelude-manager
+-prewikka
 -proxychains
 -pyrit
 -raddump
@@ -82,12 +84,12 @@ gnome-keyring-pam
 -safecopy
 -samdump2
 -scalpel
+-sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
 -tripwire
 -wipe
--zmap
 
 %end
 

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
+Sugar on a Stick 10 (Unknown)
+Fedora release 20 (Rawhide)
 EOF
-cat /etc/fedora-release >> /boot/olpc_build
 
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF
@@ -76,19 +76,13 @@ sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.con
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 
 # Don't use the default system user (in SoaS liveuser) as nick name
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
+
 # Disable the logout menu item in Sugar
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
+
 # Enable Sugar power management
-cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
-[org.sugarlabs.user]
-default-nick='disabled'
-
-[org.sugarlabs]
-show-logout=false
-
-[org.sugarlabs.power]
-automatic=true
-EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 
 cat >> /etc/rc.d/init.d/livesys << EOF
 # set up lightdm autologin

fedora-livedvd-electronic-lab.ks

@@ -0,0 +1,59 @@
+# Description : Live DVD image for Fedora/Free Electronic Lab
+#
+# Maintainer(s):
+# - Chitlesh Goorah <chitlesh a fedoraproject.org>
+# - Thibault North  <tnorth   a fedoraproject.org>
+
+%include fedora-livecd-desktop.ks
+
+# DVD payload
+part / --size 10240
+
+%packages
+
+@electronic-lab
+
+# Support for the Milkymist hardware community
+@milkymist
+
+
+# Office
+dia
+vym
+libreoffice-writer
+libreoffice-calc
+libreoffice-impress
+#libreoffice-extendedPDF
+planner
+graphviz
+
+
+# debugging tools
+make
+gdb
+valgrind
+kdbg
+wireshark-gnome
+qemu
+
+
+# EDA/CAD department
+perl-Test-Pod
+perl-Test-Pod-Coverage
+
+
+# Removing unnecessary packages from the desktop spin
+-abiword
+-@games
+-gimp
+-gimp-libs
+-gimp-data-extras
+-kdebluetooth
+-kbluetooth
+-rdesktop
+
+%end
+
+%post
+
+%end

fedora-livedvd-games.ks

@@ -53,12 +53,12 @@ maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-#neverball #cut for size
+neverball
 nogravity
 pinball
 scorched3d
 supertux
-#supertuxkart #remove for size
+supertuxkart
 ultimatestunts
 warzone2100
 wesnoth
@@ -91,7 +91,6 @@ lordsawar
 lure
 machineball
 nethack
-openlierox
 pachi
 pioneers
 quarry
@@ -150,7 +149,6 @@ pingus
 # puzzles (small)
 
 escape
-gbrainy
 magicor
 mirrormagic
 pipenightdreams
@@ -171,6 +169,7 @@ celestia
 childsplay
 gcompris
 planets
+stellarium
 tuxpaint
 tuxpaint-stamps
 tuxtype2

fedora-livedvd-robotics.ks

@@ -78,6 +78,7 @@ firefox
 -ntsysv
 
 # Drop some system-config things
+-system-config-boot
 -system-config-language
 -system-config-network
 -system-config-rootpassword
@@ -102,9 +103,9 @@ disable-lock-screen=true
 FOE
 
 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=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-notebook
+sagemath
+sagemath-notebook
 
 #Devel tools
 
@@ -48,26 +48,21 @@ ddd
 valgrind
 
 #python 2 tools/libraries not included from the groups
-python-tools
 python-ipython
 python-ipython-console
 python-ipython-notebook
 sympy
 python-networkx
-python-pandas
 
 #python 3 and tools/libraries not included from the groups
 python3
-python3-tools
 python3-matplotlib
 python3-scipy
 python3-numpy
 python3-ipython
 python3-ipython-console
 python3-ipython-notebook
-python3-sympy
 python3-networkx
-python3-pandas
 
 # matplotlib backends
 python-matplotlib-qt4
@@ -171,10 +166,6 @@ hevea
 #Include Mozilla Firefox
 firefox
 
-# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
--kde-l10n-*
--calligra-l10n-*
-
 %end
 
 %post

fedora-lxde-packages.ks

@@ -12,10 +12,7 @@
 @lxde-apps
 @lxde-media
 @lxde-office
-@networkmanager-submodules
-
-# FIXME: can be omitted once comps is updated
-midori
+@firefox
 
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -38,6 +35,9 @@ metacity
 #-man-pages-*
 #-words
 
+# use ssmtp
+ssmtp
+
 # save some space
 -autofs
 -acpid
@@ -50,9 +50,13 @@ metacity
 -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,7 +1,6 @@
 %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
@@ -10,6 +9,7 @@ compiz-plugins-extra
 compiz-manager
 compizconfig-python
 compiz-plugins-unsupported
+compiz-bcop
 compiz-mate
 libcompizconfig
 compiz-plugins-main
@@ -17,8 +17,8 @@ ccsm
 emerald-themes
 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-not-rawhide.ks

@@ -1,3 +1,3 @@
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch

fedora-repo-rawhide.ks

@@ -1 +1 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

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

fedora-soas-packages.ks

@@ -8,6 +8,7 @@
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Mel Chua <mchua AT fedoraproject DOT org>
 
+
 %packages
 -@fonts
 -@dial-up
@@ -28,18 +29,6 @@
 -realmd
 -eekboard-libs
 -open-vm-tools*
--gfs2-utils
--abrt-cli
--ibus*
--hyperv-daemons
-
-# Add some extra fonts
-dejavu-sans-fonts
-dejavu-sans-mono-fonts
-madan-fonts
-aajohan-comfortaa-fonts
-sil-abyssinica-fonts
-vlgothic-fonts
 
 # == Core Sugar Platform ==
 @sugar-desktop
@@ -52,9 +41,6 @@ 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
@@ -84,5 +70,6 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 sugar-logos
+-sugar-write
 
 %end

fedora-workstation-packages.ks

@@ -1,28 +0,0 @@
-%packages
-
-# 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
-
-# Branding for the installer
-fedora-productimg-workstation
-
-# Exclude unwanted packages from @anaconda-tools group
--gfs2-utils
--reiserfs-utils
-
-%end

fedora-x86_64-cloud.ks

@@ -0,0 +1,18 @@
+%include fedora-cloud-base.ks
+
+%packages
+kernel
+%end
+
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel
+EOF
+fi

fedora-xfce-packages.ks

@@ -12,7 +12,6 @@
 
 %packages
 
-@networkmanager-submodules
 @xfce-desktop
 @xfce-apps
 @xfce-extra-plugins
@@ -21,11 +20,6 @@
 
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
-# Add some screensavers, people seem to like them
-# Note that blank is still default.
-xscreensaver-extras
-wget
-system-config-printer
 
 # save some space
 -autofs
@@ -35,6 +29,19 @@ system-config-printer
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
+-gnumeric
+-foomatic-db-ppds
+-foomatic
+-stix-fonts
+-ibus-typing-booster
 -xfce4-sensors-plugin
+#-man-pages-*
+
+# drop some system-config things
+-system-config-boot
+-system-config-network
+-system-config-rootpassword
+#-system-config-services
+-policycoreutils-gui
 
 %end

l10n/fedora-livecd-desktop-de_CH.ks

@@ -1,9 +1,9 @@
-# fedora-live-workstation-de_CH.ks
+# fedora-livecd-desktop-de_CH.ks
 #
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang de_DE.UTF-8
 keyboard sg-latin1-nodeadkeys

l10n/fedora-livecd-desktop-de_DE.ks

@@ -1,9 +1,9 @@
-# fedora-live-workstation-de_DE.ks
+# fedora-livecd-desktop-de_DE.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys

l10n/fedora-livecd-desktop-fr_FR.ks

@@ -1,4 +1,4 @@
-# fedora-live-workstation-fr_FR.ks
+# fedora-livecd-desktop-fr_FR.ks
 #
 # Description:
 # - French Fedora Live Spin with the Gnome Desktop Environment
@@ -6,7 +6,7 @@
 # Maintainer(s):
 # - Matthieu Saulnier <fantom@fedoraproject.org>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang fr_FR.UTF-8
 keyboard fr-latin9

l10n/fedora-livecd-desktop-nl_NL.ks

@@ -1,9 +1,9 @@
-# fedora-live-workstation-nl_NL.ks
+# fedora-livecd-desktop-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang nl_NL.UTF-8
 keyboard us

l10n/fedora-livecd-desktop-pt_BR.ks

@@ -1,9 +1,9 @@
-# fedora-live-workstation-pt_BR.ks
+# fedora-livecd-desktop-pt_BR.ks
 #
 # Maintainer(s):
 # - Igor Pires Soares <igor at projetofedora.org>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang pt_BR.UTF-8
 keyboard br-abnt2

l10n/fedora-livecd-desktop-pt_PT.ks

@@ -1,9 +1,9 @@
-# fedora-live-workstation-pt_PT.ks
+# fedora-livecd-desktop-pt_PT.ks
 #
 # Maintainer(s):
 # - Pedro Silva <pedrofsilva a netcabo.pt>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang pt_PT.UTF-8
 keyboard pt-latin1

l10n/fedora-livecd-desktop-ru_RU.ks

@@ -1,9 +1,9 @@
-# fedora-live-workstation-ru_RU.ks
+# fedora-livecd-desktop-ru_RU.ks
 #
 # Maintainer(s):
 # Sergey Mihailov <sergey.mihailov at gmail.com>
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 lang ru_RU.UTF-8
 keyboard ru