desktop: Set default part size large enough for desktop spin to build

This probably wasn't tested before the release because we had stopped building the desktop (which was replaced by the workstation). Since the desktop kickstart files were still shipped in f21 (but not f22), we should fix this.
add libreoffice suite to mate, remove some drops
2025-12-09 00:20:31 +08:00 · 2015-04-22 22:03:56 -05:00 · 2015-02-25 19:57:00 +01:00 · 2014-12-02 15:03:12 -08:00 · 2014-12-02 00:25:46 +00:00 · 2014-11-28 17:24:50 -06:00
74 changed files with 1451 additions and 1139 deletions
--- a/2
+++ b/2
@@ -18,8 +18,6 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
-	mkdir -p -m 755 $(DATADIR)/$(name)/snippets
-	install -m 644 snippets/* $(DATADIR)/$(name)/snippets

 clean:
 	rm -f $(name)-*.tar.gz
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/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 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'\n%end\n"
-
--- a/atomic-installer/lorax-embed-repo.tmpl
+++ b/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}
--- a/custom/fedora-livedvd-haskell.ks
+++ b/custom/fedora-livedvd-haskell.ks
@@ -1,4 +1,4 @@
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks

 part / --size 6000

--- a/custom/qa-test-day.ks
+++ b/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
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -4,7 +4,7 @@
 lang C
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -1,20 +1,20 @@
 lang en_US.UTF-8
 #keyboard us
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

 # configure extlinux bootloader
 bootloader extlinux

-part /boot --size=512 --fstype ext4
+part /boot --size=512 --fstype ext3
 part swap --size=512 --fstype swap
-part / --size=3584 --fstype ext4
+part / --size=3000 --fstype ext4

 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig

-services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network
+services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=network

 %include fedora-repo.ks

@@ -23,13 +23,14 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup
@standard
@hardware-support
@dial-up
+@fedora-release-nonproduct

 kernel
+
 dracut-config-generic
-# install tools needed to manage and boot arm systems
-@arm-tools

 chrony
+arm-boot-config
 extlinux-bootloader
 initial-setup
 initial-setup-gui
@@ -39,9 +40,9 @@ initial-setup-gui
 # remove this in %post
 dracut-config-generic

+# install uboot images
+uboot-images-armv7

-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
 %end

 %post
@@ -51,20 +52,19 @@ 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"
+echo "Packages within this LiveCD"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*

-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount

-dnf -y remove dracut-config-generic
+/usr/sbin/a-b-c
+
+yum -y remove dracut-config-generic

 %end

--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks

-part / --size=5632 --fstype ext4
+part / --size=4000 --fstype ext4

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks

-part / --size=5500 --fstype ext4
+part / --size=5000 --fstype ext4

 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,18 +1,13 @@
 %include fedora-arm-base.ks

-part /boot --size=512 --fstype ext4
-part swap --size=256 --fstype swap
-part / --size=1279 --fstype ext4
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4

 %packages
 -@standard
 -@dial-up
 -initial-setup-gui
 -generic-release*
-glibc-all-langpacks
-glibc-langpack-en
-iw
-NetworkManager-wifi
 %end

 %post
@@ -23,5 +18,9 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
 %end

--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -1,27 +0,0 @@
-%include fedora-arm-base.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
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-packages.ks

-part / --size=5500 --fstype ext4
+part / --size=5000 --fstype ext4

 %packages
 -initial-setup
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -2,8 +2,6 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.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
--- a/fedora-atomic-vagrant.ks
+++ b/fedora-atomic-vagrant.ks
@@ -1,36 +0,0 @@
-# Like the Atomic cloud image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-atomic.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-user --name=vagrant --password=vagrant
-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"
-
-
-%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
-
--- a/fedora-cinnamon-packages.ks
+++ b/fedora-cinnamon-packages.ks
@@ -1,32 +0,0 @@
-# fedora-cinnamon-packages.ks
-#
-# Description:
-# - Fedora package set for the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%packages
-
-@networkmanager-submodules
-@cinnamon-desktop
-@libreoffice
-
-# internet and multimedia
-pidgin
-hexchat
-transmission
-parole
-
-# make sure we have a graphical installer
-yumex-dnf
-
-# extra backgrounds
-desktop-backgrounds-basic
-f24-backgrounds-extras-gnome
-
-# save some space
-fedora-icon-theme
-PackageKit*                # we switched to yumex, so we don't need this
-
-%end
--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/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
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -1,46 +1,44 @@
-# 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.
+# Fedora Atomic is a cloud-focused spin implementing the Project Atomic
+# patterns. 
+#
+# RIGHT NOW, this is very like the traditional cloud image -- this is
+# just a starting point.

 text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC

-auth --useshadow --passalgo=sha512
+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"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux

-network --bootproto=dhcp --device=link --activate --onboot=on
-services --disabled=network
-services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+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
 # Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="ext4"
+part /boot --size=200 --fstype="ext4"
 part pv.01 --grow
 volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos

-# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/24/ --ref=fedora-atomic/24/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/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/24/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/21/'

 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -48,9 +46,15 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

-# Configure docker-storage-setup to resize the partition table on boot
-# https://github.com/projectatomic/docker-storage-setup/pull/25
-echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
+# 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 .

 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -116,14 +120,26 @@ 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 "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.)"

-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
 %end

+%post --nochroot
+# Work around anaconda/dracut/lvm bug
+sync
+sync
+sync
+systemctl reboot -f -f
+%end
--- a/fedora-cloud-base-arm.ks
+++ b/fedora-cloud-base-arm.ks
@@ -1,12 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
-
-%packages
-efibootmgr
-grub2-efi
-shim
-%end
--- a/fedora-cloud-base-ppc.ks
+++ b/fedora-cloud-base-ppc.ks
@@ -1,10 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
-part /boot --fstype="ext4" --size=500
-
-%packages
-grub2
-%end
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -1,61 +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
-# rsync gets installed when the Vagrant box is first launched on the
-# users setup. This can actually take a bit of time.  Just fold it
-# in to the base box disk image
-rsync
-%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
-
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -7,29 +7,16 @@
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To do a local build, you'll need to install ImageFactory.  See
-# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
-#
-# For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# (Koji generates one internally...what we really want is Koji to publish it statically)
-# 
-# Once you have imagefactory and imagefactory-plugins installed, run:
-# 
-#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
-#   tempfile=$(mktemp --suffix=.ks)
-#   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
-#   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
-#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.

-cmdline
+text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC

-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -43,7 +30,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config

 zerombr
 clearpart --all
-part / --fstype ext4 --grow
+part / --size 3000 --fstype ext4

 %include fedora-repo.ks

@@ -52,34 +39,20 @@ reboot
 # Package list.
 # FIXME: instLangs does not work, so there's a hack below
 # (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-# FIXME: instLangs bug has been fixed but now having instLangs
-# with an arg causes no langs to get installed because of BZ1262040
-# which yields the errors in BZ1261249. For now fix by not using
-# --instLangs at all
-#%packages --instLangs=en
-%packages
+%packages --instLangs=en

 kernel-core
@^cloud-server-environment
-# Need to pull in the udev subpackage
-systemd-udev
-
-# after move away from grub2 - let's add 'which' back
-which

 # 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
-# Need to also add back plymouth in order to mask failure of
-# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
-#-plymouth
+-plymouth
 -NetworkManager
 -iprutils
-# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
-# systemd-vconsole-setup.service on boot. Comment out for now
-#-kbd
+-kbd
 -uboot-tools
 -kernel
 -grub2
@@ -130,25 +103,18 @@ 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
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
-rpm -e 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.
 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"

 # 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
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"

 # 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 {} +
@@ -171,11 +137,9 @@ 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
@@ -221,11 +185,10 @@ 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)
@@ -248,10 +211,10 @@ rm -f /var/lib/rpm/__db*
 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
+mkdir -p /var/cache/yum
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys
@@ -262,8 +225,5 @@ 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.)"

-# For trac ticket https://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
 %end

--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -1,223 +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 --passalgo=sha512
-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
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
-echo "Removing linux-firmware package."
-rpm -e 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
-
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -7,7 +7,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC

-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -99,10 +99,8 @@ 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
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
-rpm -e linux-firmware
+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.
--- a/fedora-desktop-packages.ks
+++ b/fedora-desktop-packages.ks
@@ -0,0 +1,24 @@
+%packages
+@firefox
+@gnome-desktop
+@libreoffice
+@networkmanager-submodules
+
+# FIXME; apparently the glibc maintainers dislike this, but it got put into the
+# desktop image at some point.  We won't touch this one for now.
+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
+
+%end
--- a/fedora-docker-base-arm.ks
+++ b/fedora-docker-base-arm.ks
@@ -1,6 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
--- a/fedora-docker-base-ppc.ks
+++ b/fedora-docker-base-ppc.ks
@@ -1,5 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -2,40 +2,25 @@
 #
 # 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
+bootloader --location=none
+timezone America/New_York --isUtc --nontp
+rootpw --plaintext qweqwe

 keyboard us
+firewall --disable
 zerombr
 clearpart --all
-part / --fstype ext4 --grow
+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
-sssd-client
+yum
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel

@@ -46,43 +31,20 @@ sssd-client
 # 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

-# Carry these configs for both dnf and yum for users who are calling
-# yum-deprecated directly. This will keep the experience between both
-# consistent
 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

-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.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
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -0,0 +1,93 @@
+# 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
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -0,0 +1,141 @@
+# 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-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# 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
+
+# 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
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+
+# core
+kernel*
+dracut-*
+
+# No desktops
+-cinnamon*
+-enlightenment*
+-gnome-shell
+-gnome-session
+-kde*
+-lightdm-kde
+-lightdm-razorqt
+# Pulls in qt
+-oprofile-gui
+
+-@legacy-fonts
+
+-@multimedia
+
+## common stuff
+@guest-agents
+@standard
+@core
+@hardware-support
+
+# Some development tools
+@development-libs
+@development-tools
+@c-development
+@rpm-development-tools
+@fedora-packager
+
+# Fedora Server.
+# Including this causes the fedora-release-server package to be included,
+# which in turn enables server-product-environment, and due to to its priority
+# this will be the default environment.
+@^server-product-environment
+@server-product
+@headless-management
+@container-management
+@domain-client
+
+# Common server packages
+@mysql
+@sql-server
+@web-server
+
+# Web Server environment
+@haproxy
+@mongodb
+@perl-web
+@python-web
+@php
+@rubyonrails
+@tomcat
+
+# Infrastructure Server
+@directory-server
+@dogtag
+@dns-server
+@freeipa-server
+@ftp-server
+@mail-server
+@network-server
+@printing
+@smb-server
+@virtualization
+@load-balancer
+@ha
+
+@javaenterprise
+
+# “uservisible” groups we want to offer
+@editors
+@network-server
+@system-tools
+@text-internet
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -0,0 +1,51 @@
+# 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
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -1,5 +1,4 @@
 %packages
-@firefox
@kde-apps
@kde-desktop
@kde-media
@@ -9,9 +8,6 @@

 ### The KDE-Desktop

-### Browser
-qupzilla
-
 ### fixes

 # use kde-print-manager instead of system-config-printer
@@ -21,9 +17,5 @@ mariadb-embedded
 mariadb-libs
 mariadb-server

-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
 %end

--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -1,123 +0,0 @@
-#fedora-live-astronomy-kde.ks
-# With KDE Desktop
-
-# Fedora Astronomy: For astronomers and astrophysicists
-# Fedora-Astronomy aims to create a Fedora which has the generic
-# toolset for the astronomer
-#
-# Web: https://fedoraproject.org/wiki/SIGs/Astronomy/AstroSpin
-#
-# Partly based on Scientific KDE Spin 
-#     https://fedoraproject.org/wiki/Scientific_Spin
-#
-
-# Maintainer: Christian Dersch <lupinix@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Lupinix
-
-%include fedora-live-kde.ks
-
-# The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 14500
-
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# astronomical data analysis
-cdsclient
-fpack
-gcx
-psfex
-saoimage
-scamp
-sextractor
-siril
-skyviewer
-swarp
-
-# Observatory: KStars + INDI drivers + Skychart
-indi-aagcloudwatcher
-indi-apogee
-indi-eqmod
-indi-gphoto
-indi-sx
-indistarter
-kstars
-stellarium
-
-# misc. astronomy
-celestia
-virtualplanet
-
-# Some astro environment stuff
-astronomy-menus
-astronomy-menus-toplevel
-
-#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
-# Python 3 astronomy
-python3-astropy
-python3-astroML
-python3-astroML-addons
-python3-astroquery
-python3-APLpy
-python3-ATpy
-python3-ccdproc
-python3-gatspy
-python3-photutils
-python3-sep
-
-# matplotlib backends
-python3-matplotlib-qt4
-python3-matplotlib-qt5
-python3-matplotlib-tk
-
-
-# Python IDE very useful for scientific use
-python3-spyder
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-gimp
-kst
-kst-docs
-kst-fits
-LabPlot
-
-#Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
-ImageMagick
-kate
-kate-plugins
-rlwrap
-screen
-plasma-applet-redshift-control
-
-# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
-kde-l10n-*
-calligra-l10n-*
-
-%end
-
-%post
-
-%end
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -10,16 +10,12 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-zerombr
-clearpart --all
-part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=network,sshd
-network --bootproto=dhcp --device=link --activate
-shutdown
+part / --size 3072 --fstype ext4
+services --enabled=NetworkManager --disabled=network,sshd

 %include fedora-repo.ks

@@ -28,6 +24,7 @@ shutdown
@guest-desktop-agents
@standard
@core
+@fedora-release-nonproduct
@fonts
@input-methods
@dial-up
@@ -38,8 +35,6 @@ shutdown
 # Explicitly specified here:
 # <notting> walters: because otherwise dependency loops cause yum issues.
 kernel
-kernel-modules
-kernel-modules-extra

 # This was added a while ago, I think it falls into the category of
 # "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
@@ -53,13 +48,6 @@ anaconda
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts

-# Without this, initramfs generation during live image creation fails: #1242586
-dracut-live
-grub2-efi
-syslinux
-
-# anaconda needs the locales available to run for different locales
-glibc-all-langpacks
 %end

 %post
@@ -206,9 +194,6 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :

-# Don't sync the system clock when running live (RHBZ #1018162)
-sed -i 's/rtcsync//' /etc/chrony.conf
-
 # Mark things as configured
 touch /.liveimg-configured

@@ -290,6 +275,7 @@ systemctl enable tmp.mount
 # 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
@@ -305,21 +291,19 @@ rm -f /var/lib/rpm/__db*
 # go ahead and pre-make the man -k cache (#455968)
 /usr/bin/mandb

+# save a little bit of space at least...
+rm -f /boot/initramfs*
 # make sure there aren't core files lying around
 rm -f /core*

-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
 # convince readahead not to collect
 # FIXME: for systemd

-echo 'File created by kickstart. See systemd-update-done.service(8).' \
-    | tee /etc/.updated >/var/.updated
-
-# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
-# See bug 1317709
-rm -f /boot/*-rescue*
+# 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

 %end

--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -1,51 +0,0 @@
-# fedora-live-cinnamon.ks
-#
-# Description:
-# - Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-cinnamon-packages.ks
-
-part / --size=6144
-
-%post
-# cinnamon configuration
-
-# create /etc/sysconfig/desktop (needed for installation)
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/cinnamon-session
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Cinnamon as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# and mark it as executable
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# this goes at the end after all other changes. 
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
-
-%end
-
-
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -1,5 +1,5 @@
 # fedora-design-suite.ks
-# Based on Live Workstation
+# Based on Live Desktop
 # Description:
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
@@ -7,30 +7,70 @@
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas

-%include fedora-live-workstation.ks
+%include fedora-live-desktop.ks

-# Size partition
-part / --size 14336
+#DVD size partition
+part / --size 8192

 %packages
-# Switch to groups for design suite
-@design-suite

-# Preview Gnome Photos
-gnome-photos
+# graphics
+blender
+bluefish 
+#cinepaint
+cmyktool
+darktable
+dia
+entangle
+fontforge
+font-manager 
+gimp
+gimp-*-plugin
+gimp-data-extras
+gimp-gap
+gimp-paint-studio
+gimp-high-pass-filter
+gimp-normalmap
+gimp-resynthesizer
+gimp-separate+
+gpick
+GREYCstoration-gimp 
+hugin 
+mypaint
+inkscape
+nautilus-image-converter
+optipng
+phatch
+screenruler
+simple-scan
+scribus
+colord-extra-profiles 
+synfigstudio
+xournal

-# Add gthumb for renaming group files
-gthumb
+# office
+vym
+pdfshuffler  

-# Extra wallpapers
-f23-backgrounds-extras-base
-f23-backgrounds-extras-gnome
-f24-backgrounds-extras-base
-f24-backgrounds-extras-gnome
+# internet
+filezilla

-# removal of unneeded applications
+# audio & video
+audacity
+pitivi
+
+# 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

 %end
@@ -39,7 +79,9 @@ f24-backgrounds-extras-gnome
 #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', 'gnome-photos.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+#Enable categories in Gnome Shell
+app-folder-categories=['Utilities', 'Games', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'wine-wine', 'Crossover', 'Crossover Games', 'Science', 'Education', 'Universal Access', 'Other']
 FOE

 # Add link to lists of tutorials
@@ -48,40 +90,17 @@ cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 Name=List of design tutorials
 GenericName=List of Tutorials for Designers
 Comment=Reference of Design Related Tutorials
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=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
-Exec=xdg-open https://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 
-Comment=Wiki page of Design Team
-Exec=xdg-open https://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

+#EOF
+
 %end
+
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -0,0 +1,65 @@
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-base.ks
+%include fedora-desktop-packages.ks
+
+part / --size 6144
+
+%post
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+
+# disable updates plugin
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
+[org.gnome.software]
+download-updates=false
+FOE
+
+# don't run gnome-initial-setup
+mkdir ~liveuser/.config
+touch ~liveuser/.config/gnome-initial-setup-done
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+  # need to move it to anaconda.desktop to make shell happy
+  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
+FOE
+
+  # Make the welcome screen show up
+  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
+    mkdir -p ~liveuser/.config/autostart
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
+  fi
+fi
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up auto-login
+cat > /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF
+
+%end
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>

-%include fedora-live-kde.ks
+%include fedora-livecd-kde.ks

 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -40,7 +40,6 @@ jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
-ffado

 #pulse
 pulseaudio-module-jack
@@ -77,7 +76,7 @@ sooperlooper

 #recodring and DAW
 audacity
-ardour4
+ardour3
 rosegarden4
 seq24
 muse
@@ -168,6 +167,9 @@ rtirq
 japa
 radium-compressor

+#streaming
+idjc
+
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
@@ -197,12 +199,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
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -7,46 +7,71 @@

 %post

-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
+# 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
 cat >> /etc/rc.d/init.d/livesys << EOF

+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    # use image also for kdm
+    mkdir -p /usr/share/apps/kdm/faces
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make liveuser use KDE
+echo "startkde" > /home/liveuser/.xsession
+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
+sed -i 's/^#Session=.*/Session=kde-plasma.desktop/' /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
-Session=plasma.desktop
+Session=kde-plasma.desktop
 SDDM_EOF
 fi

 # 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/firefox.desktop,/usr/share/applications/org.kde.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
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-# set executable bit disable KDE security warning
+
+# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
 chmod +x /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
+
+# copy over the icons for liveinst to hicolor
+cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
+cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
+cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
+cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
+cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
+cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
+touch /usr/share/icons/hicolor/

 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
@@ -55,14 +80,23 @@ 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/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \
-    /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 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 baloo
-cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
+cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
 [Basic Settings]
 Indexing-Enabled=false
 BALOO_EOF
@@ -73,16 +107,24 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF

-# Disable kwallet migrator
-cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
-[Migration]
-alreadyMigrated=true
-KWALLET_EOL
+# 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
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -1,7 +1,8 @@
-# fedora-livecd-kde.ks
+# fedora-live-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), 2 GiB version
+#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -11,61 +12,33 @@
 %include fedora-live-minimization.ks

 # DVD payload
-part / --size=6144
+part / --size=8192


 %packages
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
+# ship KDE wallpapers instead of GNOME ones
 -desktop-backgrounds-basic
-kdeaccessibility*
-#-ktorrent			# kget has also basic torrent features (~3 megs)
-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
-kipi-plugins			# ~8 megs + drags in Marble
-#-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
+kde-wallpapers

-# 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
 #kdeartwork			# only include some parts of kdeartwork
 fuse
 liveusb-creator
+#pavucontrol			# pavucontrol has duplicate functionality with kmix
+krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)

-# only include kdegames-minimal
-kdegames
-kdegames-minimal
+# kdeedu apps
+@kde-education

-### space issues
+# Cantor backends
+cantor-R		# Cantor R backend, built against R-core at compile time
+maxima			# runtime dependency of the Cantor Maxima backend
+octave			# runtime dependency of the Cantor Octave backend

-# 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-tw-fonts 	# traditional Chinese
-
-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
-# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
-
-# save some space (from @standard)
-make
-
-# admin-tools
-gnome-disk-utility
-# kcm_clock still lacks some features, so keep system-config-date around
-#-system-config-date
-# prefer kcm_systemd
-system-config-services
-# prefer/use kusers
-system-config-users
+# KDE 4 translations
+kde-l10n-*
+calligra-l10n-*

 ## avoid serious bugs by omitting broken stuff

--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -1,50 +1,11 @@
-# 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-base.ks
 %include fedora-mate-packages.ks
-%include fedora-live-minimization.ks

-part / --size 6144
-
-%packages
-
-# Drop things for size
-@3d-printing
-brasero
-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
-
-# 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
+part / --size 4096 

 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -7,6 +7,7 @@
 -mpage
 -sox
 -hplip
+-hpijs
 -numactl
 -isdn4k-utils
 -autofs
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -4,12 +4,14 @@

 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
-%include snippets/packagekit-cached-metadata.ks

-part / --size 6656
+part / --size 6144 

 %post

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 cat >> /etc/rc.d/init.d/livesys << EOF


--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -0,0 +1,112 @@
+# 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.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-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
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -0,0 +1,76 @@
+# fedora-livecd-kde.ks
+#
+# Description:
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+#
+# Maintainer(s):
+# - Sebastian Vahl <fedora@deadbabylon.de>
+# - Fedora KDE SIG, http://fedoraproject.org/wiki/SIGs/KDE, kde@lists.fedoraproject.org
+
+%include fedora-live-kde-base.ks
+%include fedora-live-minimization.ks
+
+# DVD payload
+part / --size=4096
+
+
+%packages
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+-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)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+k3b				# ~15 megs
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+liveusb-creator
+
+# only include kdegames-minimal
+-kdegames
+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
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @standard)
+-make
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
+## avoid serious bugs by omitting broken stuff
+
+%end
+
+%post
+%end
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
--- a/fedora-livecd-mate_compiz.ks
+++ b/fedora-livecd-mate_compiz.ks
@@ -0,0 +1,78 @@
+# 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
+
+# system tools
+system-config-printer
+system-config-printer-applet
+
+
+# audio player
+audacious
+
+# office
+@libreoffice
+
+# dsl tools
+rp-pppoe
+
+# First, no office
+#-planner
+
+# Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-colord
+-@dial-up
+-espeak
+-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
+-desktop-backgrounds-basic
+-*backgrounds-extras
+
+# Legacy cmdline things we don't want
+
+%end
+
+%post
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -6,9 +6,10 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
+#   Christoph Wickert <cwickert [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
-#   many thanks, especially to Christoph Wickert!
+#   many thanks!
 #   Fedora LXDE Spin - Copied over stuff to make LXDE Default
 #   Luke Macken and Adam Miller for the original OpenBox Security ks and all
 #   the Security Applications! 
@@ -74,6 +75,7 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
+-picviz-gui
 -proxychains
 -pyrit
 -raddump
@@ -86,13 +88,18 @@ gnome-keyring-pam
 -tcpreplay
 -tripwire
 -wipe
-zmap
+
+# Is not available for OpenVAS-7. No longer supported by upstream.
+-openvas-client 

 %end

 %post
 # xfce configuration

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)

 cat > /etc/sysconfig/desktop <<EOF
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -51,7 +51,6 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
-org.laptop.Words
 org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
@@ -59,7 +58,6 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -16,6 +16,9 @@
 %post
 # xfce configuration

+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)

 cat > /etc/sysconfig/desktop <<EOF
@@ -30,7 +33,7 @@ mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
-WebBrowser=firefox
+WebBrowser=midori
 FOE

 # disable screensaver locking (#674410)
--- a/fedora-livedvd-electronic_lab.ks
+++ b/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
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@@ -4,10 +4,10 @@
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram

-%include fedora-live-xfce.ks
+%include fedora-livecd-xfce.ks

 # The recommended part size for DVDs is too close to use for the games spin
-part / --size 14336
+part / --size 10240

 %packages

@@ -20,9 +20,6 @@ part / --size 14336
 # will likely put the games spin over size and it is freeze time.
 -libreoffice*

-# Extra screensavers isn't much help for the games spin
-xscreensaver-extras
-
 # Allow joysticks and game pads to work
 joystick-support

@@ -35,17 +32,17 @@ armacycles-ad
 asc
 asc-music
 astromenace
-# beneath-a-steel-sky-cd scummvm games cut for size
+beneath-a-steel-sky-cd
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
-# flight-of-the-amazon-queen-cd scummvm games cut for size
+flight-of-the-amazon-queen-cd
 freeciv
 freecol
 freedoom
-# freedroidrpg cut for size
+freedroidrpg
 frozen-bubble
 gl-117
 glob2
@@ -58,22 +55,22 @@ nethack-vultures
 netpanzer
 #neverball #cut for size
 nogravity
-#pinball # Would pull in fluid-soundfont-lite-patches
+pinball
 scorched3d
 supertux
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
-# worminator # Would pull in fluid-soundfont-lite-patches
-# warmux - Cut for size
+worminator
+warmux
 xmoto

 # traditional (small)

 abe
-# alex4 # Would pull in fluid-soundfont-lite-patches
-# ballz # Would pull in fluid-soundfont-lite-patches
+alex4
+ballz
 blobwars
 bombardier
 cdogs-sdl
@@ -88,19 +85,19 @@ hedgewars
 kcheckers
 knights
 lbrickbuster2
-# liquidwar # Would pull in fluid-soundfont-lite-patches
+liquidwar
 londonlaw
 lordsawar
-# lure scummvm games cut for size
-# machineball # Would pull in fluid-soundfont-lite-patches
+lure
+machineball
 nethack
 openlierox
 pachi
 pioneers
 quarry
-# Ri-li cut for size
+Ri-li
 rogue
-# scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
+scorchwentbonkers
 seahorse-adventures
 solarwolf
 sopwith
@@ -112,11 +109,11 @@ xblast

 auriferous
 alienblaster
-# duel3 # Would pull in fluid-soundfont-lite-patches
+duel3
 lmarbles
 powermanga
-# raidem # Would pull in fluid-soundfont-lite-patches
-# raidem-music # Would pull in fluid-soundfont-lite-patches
+raidem
+raidem-music
 trackballs
 trackballs-music

@@ -126,7 +123,7 @@ ballbuster
 CriticalMass
 dd2
 KoboDeluxe
-# lacewing # Would pull in fluid-soundfont-lite-patches
+lacewing
 Maelstrom
 methane
 njam
@@ -135,13 +132,13 @@ shippy
 tecnoballz
 wordwarvi
 xgalaxy
-# zasx # Would pull in fluid-soundfont-lite-patches
+zasx

 # falling blocks games (small) 

 amoebax
 crack-attack
-# crystal-stacker # Would pull in fluid-soundfont-lite-patches
+crystal-stacker
 gemdropx
 gweled

@@ -153,7 +150,7 @@ pingus
 # puzzles (small)

 escape
-# gbrainy Removed for space - only game that pulls in mono
+gbrainy
 magicor
 mirrormagic
 pipenightdreams
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
@@ -6,7 +6,7 @@
 %include fedora-live-minimization.ks

 # The recommended part size for DVDs is too close to use for the robotics spin
-part / --size 10752
+part / --size 10240

 %packages
 # Start with GNOME
--- a/fedora-livedvd-scientific_kde.ks
+++ b/fedora-livedvd-scientific_kde.ks
@@ -1,9 +1,11 @@
-# Fedora Scientific with KDE Desktop
+#fedora-livedvd-scientific-kde.ks
+# With KDE Desktop

 # Fedora Scientific: For researchers in Science and Engineering
 # Fedora-Scientific aims to create a Fedora which has the generic
 # toolset for the researcher
-# Web: https://labs.fedoraproject.org/en/scientific/
+# Web: https://fedoraproject.org/wiki/Scientific_Spin
+# Web: http://spins.fedoraproject.org/scientific-kde/

 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
@@ -11,7 +13,7 @@
 %include fedora-live-kde.ks

 # The recommended part size for DVDs is too close to use for the scientific spin
-part / --size 14500
+part / --size 12288

 %packages

@@ -23,8 +25,10 @@ scilab
 scilab-devel
 scilab-doc

-# Remove sagemath explicitly?
-sagemath
+# sagemath
+# BZ #1006230 should fix this
+#sagemath
+#sagemath-notebook

 #Devel tools

@@ -84,10 +88,6 @@ rkward
 # GUI for Octave
 qtoctave

-# julia
-julia
-julia-doc
-
 # IDEs for the IDE folks
@eclipse
 spyder
@@ -110,6 +110,8 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
+pvm
+pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi
@@ -153,8 +155,8 @@ xzgv
 gimp
 ggobi
 ggobi-devel
-#g3data
-#Mayavi
+g3data
+Mayavi

 #Misc. Utils
 screen
@@ -173,4 +175,4 @@ firefox

 %post

-%end
+%end
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -1,5 +1,7 @@
 %packages
 -PackageKit*                # we switched to yumex, so we don't need this
+-ConsoleKit                 # ConsoleKit is deprecated
+-ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
@mate
 compiz
@@ -7,51 +9,22 @@ compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
-compiz-plugins-experimental
+compiz-plugins-unsupported
+compiz-mate
 libcompizconfig
 compiz-plugins-main
 ccsm
-simple-ccsm
 emerald-themes
 emerald
 fusion-icon
-@networkmanager-submodules
-blueman
-
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-
-# more backgrounds
-f24-backgrounds-base
-f24-backgrounds-mate
-f24-backgrounds-extras-base
-
-# system tools
-system-config-printer
-system-config-printer-applet
-lightdm-gtk-greeter-settings
-
-# audio video
-parole
-exaile
-PackageKit-gstreamer-plugin
-
-# blacklist applications which breaks mate-desktop
-audacious
-
-# office
+fusion-icon-gtk
@libreoffice
-
-# dsl tools
-rp-pppoe
-
-# some tools
-p7zip
-p7zip-plugins
+@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.
 nss-mdns

+# This one needs to be kicked out of @standard
+-smartmontools
 %end
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,4 +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
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$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
--- a/fedora-repo-rawhide.ks
+++ b/fedora-repo-rawhide.ks
@@ -1,2 +1 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
--- a/fedora-repo.ks
+++ b/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
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -32,7 +32,6 @@
 -abrt-cli
 -ibus*
 -hyperv-daemons
-webkitgtk4-plugin-process-gtk2

 # Add some extra fonts
 dejavu-sans-fonts
@@ -77,6 +76,9 @@ pulseaudio-utils
 # Usefulness for DSL connections as per:
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools

 # Get the Sugar boot screen
 -plymouth-system-theme
--- a/fedora-virt-server.ks.in
+++ b/fedora-virt-server.ks.in
@@ -0,0 +1,72 @@
+# Kickstart file to create a small "base" Fedora image install suitable
+# for use as e.g. an application server.
+# 
+# Maintainer: fedora-cloud-list@fedoraproject.org
+#
+# REQUIRED variables:
+#   @@PUBLIC_KEY@@ - ssh public key
+# 
+# You must search for all required variables and replace them.
+# Example usage:
+# sed -e s,@@PUBLIC_KEY@@,"$(cat ~/.ssh/authorized_keys)", fedora-virt-server.ks.in > my-fedora-server.ks
+
+lang C
+keyboard us
+timezone --utc GMT/Zulu
+auth --useshadow --enablemd5
+firewall --service=ssh
+bootloader --timeout=1 --append="acpi=force"
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+
+## IMPORTANT ##
+## EDIT HERE ##
+# ROOT PASSWORD:
+# Setting a root password is NOT RECOMMENDED, especially if your
+# server will be accessible to the public internet.  This is
+# because of the rise of automated ssh password guessing attacks.
+# You should instead (if you don't have one already)
+# generate a public ssh key:
+# http://sial.org/howto/openssh/publickey-auth/
+# 
+# See comment below in %post for authorizing your public
+# key for the root account.
+
+rootpw ""
+
+# However, if you choose instead to make a password,
+# you will need to replace the above line with one like
+# rootpw --iscrypted @@ROOT_PASSWORD_CRYPTED@@
+# If you do neither of these things, you will not be able to log
+# into your machine.
+
+clearpart --all --initlabel
+part / --size=550 --grow --fstype=ext4
+# You may change this if you don't want swap
+part swap --recommended
+
+%packages
+@standard
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post
+
+## EDIT HERE ##
+cd /root
+if ! test -d .ssh; then
+  mkdir --mode=700 .ssh
+fi
+cat >> .ssh/authorized_keys << END_AUTHORIZED_KEYS
+@@PUBLIC_KEY@@
+END_AUTHORIZED_KEYS
+chmod 600 .ssh/authorized_keys
+if -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
+  chcon -R -h -t home_ssh_t .ssh
+fi
+
+%end
+
+reboot
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -2,6 +2,7 @@

 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
+-@fedora-release-nonproduct
 -@input-methods
 -@standard

@@ -9,9 +10,7 @@
 # workstation-product-environment in comps
@base-x
@core
-@firefox
@fonts
-@gnome-desktop
@guest-desktop-agents
@hardware-support
@libreoffice
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -21,17 +21,9 @@

 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
-# Admin tools are handy to have
-@admin-tools
 # Add some screensavers, people seem to like them
 # Note that blank is still default.
 xscreensaver-extras
-wget
-# Handy for debugging
-rfkill
-# Better more popular browser
-firefox
-system-config-printer

 # save some space
 -autofs
--- a/snippets/autologin-gdm.ks
+++ b/snippets/autologin-gdm.ks
@@ -0,0 +1,12 @@
+# %post modifications for gdm
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+chown -R fedora:fedora /home/fedora
+sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
+    chown fedora:fedora /home/fedora/.face
+    # TODO: would be nice to get e-d-s to pick this one up too... but how?
+fi
+EOF
+
--- a/snippets/autologin-kdm.ks
+++ b/snippets/autologin-kdm.ks
@@ -0,0 +1,33 @@
+# %post modifications for kdm and kde
+
+# add initscript
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    # use image also for kdm
+    mkdir -p /usr/share/apps/kdm/faces
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make fedora user use KDE
+echo "startkde" > /home/fedora/.xsession
+chmod a+x /home/fedora/.xsession
+chown fedora:fedora /home/fedora/.xsession
+
+# set up autologin for user fedora
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+
+# set up user fedora as default user and preselected user
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/fedora/.kde/share/config/
+cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
+[Favorites]
+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
+chown -R fedora:fedora /home/fedora/.kde/
+EOF
+
--- a/snippets/config-developer.ks
+++ b/snippets/config-developer.ks
@@ -0,0 +1,7 @@
+# %post modifications to add link to demonstration videos to desktop
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+pushd /home/fedora/Desktop
+ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
+popd
+EOF
--- a/snippets/config-electronic-lab.ks
+++ b/snippets/config-electronic-lab.ks
@@ -0,0 +1,57 @@
+# %post modifications specifically for Fedora Electronic Lab
+
+# Fedora Electronic Lab: Kwin buttons
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
+[Style]
+ButtonsOnLeft=MB
+ButtonsOnRight=FIAX
+CustomButtonPositions=true
+EOF
+
+# kill klipper
+cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
+[General]
+AutoStart=false
+EOF
+
+# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
+cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
+[Digital]
+LCD_Style=false
+Show_Date=false
+Show_Seconds=true
+
+[General]
+Type=Digital
+EOF
+
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
+[Layout]
+DisplayNames=
+EnableXkbOptions=false
+IncludeGroups=
+LayoutList=us,de,fr,jp
+Model=pc104
+Options=
+ResetOldOptions=false
+ShowFlag=true
+ShowSingle=true
+StickySwitching=false
+StickySwitchingDepth=2
+SwitchMode=Global
+Use=true
+EOF
+
+# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
+# This is a feature for Fedora and not for KDE
+cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
+
+/sbin/chkconfig anacron off
+/sbin/chkconfig sendmail off
+/sbin/chkconfig nfs off
+/sbin/chkconfig nfslock off
+/sbin/chkconfig rpcidmapd off
+/sbin/chkconfig rpcbind off
--- a/snippets/config-kde-gnome-keyring.ks
+++ b/snippets/config-kde-gnome-keyring.ks
@@ -0,0 +1,19 @@
+# %post modifications to set up gnome-keyring in KDE
+
+mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
+cat > /etc/skel/.kde/env/start-custom.sh << EOF
+#!/bin/sh
+eval \`gnome-keyring-daemon\`
+export GNOME_KEYRING_PID
+export GNOME_KEYRING_SOCKET
+EOF
+chmod 755 /etc/skel/.kde/env/start-custom.sh
+
+cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
+#/bin/sh
+if [-n "$GNOME_KEYRING_PID"]; then
+	kill $GNOME_KEYRING_PID
+fi
+EOF
+
+chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh
--- a/snippets/config-tracker.ks
+++ b/snippets/config-tracker.ks
@@ -0,0 +1,16 @@
+# %post modifications to configure tracker search
+
+mkdir -p /home/fedora/.config/tracker
+
+cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
+
+mkdir -p /root/.config/tracker
+cat > /root/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
--- a/snippets/eeepc900-modifications.ks
+++ b/snippets/eeepc900-modifications.ks
@@ -0,0 +1,164 @@
+###### Eee PC 900 stuff ####################################################
+#
+###### Hotkeys #############################################################
+cat > /etc/acpi/actions/hotkeys.sh << EOHOTKEY
+#!/bin/bash
+
+export DISPLAY=:0
+
+case "$3" in
+
+    #Fn+F2
+    00000010)
+        # Wlan On
+        /etc/acpi/actions/wlan.sh poweron
+        ;;
+    00000011)
+        # Wlan Off
+        /etc/acpi/actions/wlan.sh poweroff
+        ;;
+
+    #Fn+F6
+    00000012)
+        # Webcam switch
+        /etc/acpi/actions/camera.sh
+        # TaskManager
+	# /usr/bin/gnome-system-monitor
+	;;
+
+    #Fn+F7
+    00000013)
+        # Volume mute
+	/usr/bin/amixer set -D hw:0 Master toggle
+	;;
+
+    #Fn+F8
+    00000014)
+        # Volume down
+        /usr/bin/amixer set -D hw:0 Master 10%- unmute
+        ;;
+
+    #Fn+F9
+    00000015)
+        # Volume up
+        /usr/bin/amixer set -D hw:0 Master 10%+ unmute
+        ;;
+
+    #Fn+F5
+    00000030)
+
+	/usr/bin/xrandr --output VGA  --mode 1024x768 \
+			--output LVDS --off
+
+	if [[ "$?" != "0" ]]; then
+
+	/usr/bin/xrandr --output VGA  --preferred \
+			--output LVDS --off
+
+	fi
+	;;
+
+    00000031)
+
+	/usr/bin/xrandr --output LVDS --mode 800x480 \
+		        --output VGA  --mode 800x600
+
+        ;;
+    
+    00000032)
+
+	/usr/bin/xrandr --output VGA  --off       \
+           		--output LVDS --preferred
+
+        ;;
+    *)
+        logger "ACPI hotkey $3 action is not defined"
+        ;;
+esac
+EOHOTKEY
+
+###### WLAN #############################################################
+cat > /etc/acpi/actions/wlan.sh << EOF
+#!/bin/bash
+
+PWR=$(cat /sys/devices/platform/eeepc/wlan)
+
+UnloadModules() {
+    rmmod ath_pci
+    rmmod ath_rate_sample
+    rmmod wlan_scan_sta
+    rmmod wlan_tkip
+    rmmod wlan_wep
+    rmmod wlan
+}
+
+LoadModules() {
+    modprobe ath_pci
+}
+
+case $1 in
+    poweron)
+        if [[ "$PWR" = "0" ]]; then
+            modprobe pciehp pciehp_force=1
+
+	    echo 1 > /sys/devices/platform/eeepc/wlan
+
+	    rmmod pciehp
+
+        fi
+        ;;
+           
+    poweroff)
+        if [[ "$PWR" = "1" ]]; then
+
+            modprobe pciehp pciehp_force=1
+
+            ifconfig ath0 down
+
+            wlanconfig ath0 destroy
+
+            UnloadModules
+
+            echo 0 > /sys/devices/platform/eeepc/wlan
+
+            rmmod pciehp
+
+        fi
+        ;;
+esac
+EOF
+
+###### Webcam #############################################################
+cat > /etc/acpi/actions/camera.sh << EOF
+
+#!/bin/bash
+
+CAMERA=$(cat /sys/devices/platform/eeepc/camera)
+
+        if [[ "$CAMERA" = "0" ]]; then
+   	    echo 1 > /sys/devices/platform/eeepc/camera
+         else
+            echo 0 > /sys/devices/platform/eeepc/camera
+        fi
+EOF
+
+chmod +x "/etc/acpi/actions/*"
+
+###### Shutdown fix #########################################################
+echo "modprobe -r snd-hda-intel" >> /sbin/halt.local
+chmod 755 /sbin/halt.local
+
+###### Gnome display stuff ##################################################
+
+gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8"
+gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8"
+gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8"
+gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "<Alt>F11"
+gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons"
+gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]"
+gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0
+gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0
+gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19
+gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19
--- a/snippets/packagekit-cached-metadata.ks
+++ b/snippets/packagekit-cached-metadata.ks
@@ -1,53 +0,0 @@
-# %post script to include initial metadata for PackageKit
-
-%post --nochroot
-# Copy over files needed for networking inside the chroot
-for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && cp $f /mnt/sysimage/$f.kickstart
-done
-%end
-
-%post
-
-# Use host machine's resolv.conf and hosts files
-for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && mv $f $f.orig
-  test -f $f.kickstart && mv -f $f.kickstart $f
-done
-
-PK_PREFIX=`mktemp -d`
-mkdir -p $PK_PREFIX/etc/yum.repos.d
-if [ -f /etc/yum.repos.d/fedora.repo ] ; then
-  cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
-  cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
-  cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
-  cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
-fi
-rpm --root=$PK_PREFIX --initdb
-DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh
-if [ -d /var/cache/PackageKit ] ; then
-  mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/
-fi
-rm -rf $PK_PREFIX
-
-# Restore original resolv.conf and hosts files
-for f in /etc/resolv.conf /etc/hosts ; do
-  rm -f $f
-  test -f $f.orig && mv $f.orig $f
-done
-
-%end
--- a/snippets/repository-debuginfo.ks
+++ b/snippets/repository-debuginfo.ks
@@ -0,0 +1,25 @@
+# %post modifications to enable debuginfo repository
+
+awk '
+BEGIN {
+  debuginfo = 0
+}
+  /^\[.*\]/ {
+  if (/debuginfo/) {
+    debuginfo = 1
+  } else {
+    debuginfo = 0
+  }
+  print
+  next
+}
+  /enabled=0/ && debuginfo {
+  print "enabled=1"
+  next
+}
+{
+  print
+  next
+}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
+mv /etc/yum.repos.d/fedora.repo{.tmp,}
+
--- a/snippets/screensaver-gnome.ks
+++ b/snippets/screensaver-gnome.ks
@@ -0,0 +1,5 @@
+# %post modifications to disable GNOME screensaver locking
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
+EOF
--- a/snippets/screensaver-kde.ks
+++ b/snippets/screensaver-kde.ks
@@ -0,0 +1,3 @@
+# %post modifications to disable KDE screensaver
+
+sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
--- a/snippets/sysconfig-kde.ks
+++ b/snippets/sysconfig-kde.ks
@@ -0,0 +1,6 @@
+# %post modifications to create /etc/sysconfig/desktop for KDE
+
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
--- a/snippets/sysconfig-xfce.ks
+++ b/snippets/sysconfig-xfce.ks
@@ -0,0 +1,5 @@
+# %post modifications to create /etc/sysconfig/desktop for XFCE
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+EOF
Author	SHA1	Message	Date
Bruno Wolff III	843b6a344e	desktop: Set default part size large enough for desktop spin to build This probably wasn't tested before the release because we had stopped building the desktop (which was replaced by the workstation). Since the desktop kickstart files were still shipped in f21 (but not f22), we should fix this.	2015-04-22 22:03:56 -05:00
raveit65	20c98db221	add libreoffice suite to mate, remove some drops	2015-02-25 19:57:00 +01:00
Adam Williamson	59e73c16ee	re-generate fontconfig cache in %post to work around #1169979	2014-12-02 15:03:12 -08:00
Peter Robinson	9ab44c5d55	soas: add some fonts	2014-12-02 00:25:46 +00:00
Bruno Wolff III	df4358b360	Remove stellarium from the games spin due to size Things are going to be very close with removing just neverball. So it looks like we need another removal and it is stellarium. This is for bug 1168983.	2014-11-28 17:24:50 -06:00
Bruno Wolff III	a79d569669	Cut neverball for size With XFCE upping its target size, a cut needed to be made to Games to keep it under its target size.	2014-11-28 12:41:42 -06:00
Dennis Gilmore	5b77508a60	explude the other productimg packages	2014-11-27 23:04:35 -06:00
Stephen Gallagher	89c95f0a43	Work around pungi issue with productimg packages Pungi and lorax pull in the complete repository set and then try to load all possible fedora-productimg-* packages. We need to explicitly exclude the ones for the different products.	2014-11-24 08:49:41 -05:00
Kevin Fenzi	952d860392	Xfce: Drop a bunch of space saving now that we are no longer targeting 700MB	2014-11-21 17:12:57 -07:00
Stephen Gallagher	b69a769629	Include banner images for Product installs	2014-11-20 15:36:21 -05:00
Kalev Lember	d796583f7a	workstation: Use anaconda branding from fedora-productimg-workstation	2014-11-17 22:13:42 +01:00
Colin Walters	31cfa9a3b2	cloud-atomic: Change osname to 'fedora-atomic' No reason to have it differ, really.	2014-11-17 15:59:07 -05:00
Colin Walters	f9306a0334	cloud-atomic: Bring sanity to the remote setup We were doing gyrations here between the "installmedia" remote and the intended "fedora-atomic" remote. Thinking about this, it's far simpler if we pretend installmedia is the target remote. We still need to delete the remote configuration Anaconda added and re-add it with the real target URL.	2014-11-17 15:58:45 -05:00
Colin Walters	16fb17d455	cloud-atomic: Trim installmedia remote Otherwise it takes up space until manually removed.	2014-11-17 15:14:56 -05:00
Amit Saha	7a7d16bc5c	scientific: add python3-sympy	2014-11-16 09:05:18 +10:00
Amit Saha	f56faabf5a	Scientific: Add couple of new tools Adds IDLE and pandas for both Python 2 and 3.	2014-11-16 08:32:58 +10:00
Matthew Miller	ddb2862b52	make the cloud base lang hacks line up with the same filenames as in the docker image	2014-11-14 10:19:21 -05:00
Matthew Miller	f3e0beb135	more hacks for en_US in cloud base image	2014-11-13 14:10:18 -05:00
Rex Dieter	12762c7a2d	kde: support modifying existing /etc/sddm.conf	2014-11-13 12:40:10 -06:00
raveit65	dd76377ad0	Mate: add more packages	2014-11-13 17:51:20 +01:00
Colin Walters	423db5a738	cloud-atomic: Switch to dl.fedoraproject.org We don't have a mirrorlist yet.	2014-11-12 12:17:32 -05:00
raveit65	93afb3345a	add more packages, no sense to reduce size if CJK font packages are so big	2014-11-12 14:09:26 +01:00
raveit65	f164fefa7a	add adobe-source-han-* fonts again	2014-11-12 12:02:09 +01:00
Luya Tshimbalanga	81d2f86266	design-suite: remove legacy comments	2014-11-11 20:31:07 -08:00
Matthew Miller	f8b2d154d6	Revert "builds failed last night with "an additional 861.02 MiB is needed"" This wasn't the problem. :) This reverts commit `4f2df51206`.	2014-11-11 18:54:05 -05:00
Matthew Miller	4f2df51206	builds failed last night with "an additional 861.02 MiB is needed"	2014-11-11 11:06:49 -05:00
raveit65	fb107cf740	add missing CJK fonts and localization	2014-11-11 17:04:21 +01:00
Matthew Miller	35d07d9bcf	Revert "remove heat-cfntools from cloud image until python3 / boto issue can be resolved" In anticipation of https://admin.fedoraproject.org/updates/FEDORA-2014-14606/python-boto-2.34.0-4.fc21 being tested and pushed to stable soon This reverts commit `365e62a37e`.	2014-11-10 17:19:58 -05:00
Colin Walters	377cf487ed	cloud-atomic: Forcibly power off after %post to work around bug The system loops with: mkdir: cannot create directory '/oldsys': Read-only filesystem mkdir: cannot create directory '/oldsys/sys': Read-only filesystem mount: mount point /oldsys/sys does not exist ... drauct Warning: Killing all remaining processes ... --- begin loop --- Unable to unlink device node for atomicos-root Unable to unlink device node for live-base rm: cannot remove /lib/drauct/hooks/shutdown/30-dm-shutdown.sh: Read-only filesystem rm: cannot remove /lib/drauct/hooks/shutdown/30-md-shutdown.sh: Read-only filesystem --- end loop --- Not entirely sure what's at fault here, but this is a quick hack to get an image building.	2014-11-10 14:22:51 -05:00
Colin Walters	09243c9986	cloud-atomic: Re-shrink rootfs partitions mattdm changed these previously because we hit an ENOSPC error during qcow2 image creation, but that really happened because the Fedora rel-eng create-cloud-images script hardcoded 3GB. Now that we've shrunk the content down to ~850MB, drop the defaults: - rootfs down to 2GB. This is enough space for a replacement of all content, plus a bit of spare room for logging - /boot to 200MB. At present, kernel+initramfs is just 30MB, so this is still very conservative.	2014-11-10 09:42:00 -05:00
Colin Walters	e46c512867	cloud-atomic: Drop SELinux relabeling This should not be necessary; we have policy loaded from the Anaconda environment.	2014-11-10 09:42:00 -05:00
Colin Walters	0ba1d1dbc6	atomic: Rewrite origin to point to metalink Basically Anaconda-in-ImageFactory is set up to pull from the builder, so that's what ends up in the origin file. But that's obviously not what we want to ship to users. ostree/rpm-ostree do not yet have a convenient command to change this, so brute force it with sed. Implements https://lists.fedoraproject.org/pipermail/cloud/2014-November/004570.html	2014-11-10 09:42:00 -05:00
Matthew Miller	66f3423525	hack around instLangs not working (due to https://bugzilla.redhat.com/show_bug.cgi?id=1051816 )	2014-11-09 11:09:19 -05:00
Matthew Miller	365e62a37e	remove heat-cfntools from cloud image until python3 / boto issue can be resolved	2014-11-09 11:06:15 -05:00
Matthew Miller	4971745782	cloud images -- leave persistant journal, since upcoming cloud-init no longer pulls in rsyslog	2014-11-07 21:55:36 -05:00
Matthew Miller	2a0fdd5241	nightly builds failing due to size. enlarge so it works, and then we'll figure it out see http://koji.fedoraproject.org/koji/taskinfo?taskID=8054050 (check the screenshot)	2014-11-06 23:08:20 -05:00
Colin Walters	fbeec77bd5	atomic: We do not support pv-grub Atomic is HVM only, since OSTree doesn't understand grub1 at the moment, and incentive to have it do so is low.	2014-11-06 22:40:39 -05:00
Colin Walters	b69402e4b4	atomic: Drop package deinstallation This isn't supported; at the moment the tree has authconfig and linux-firmware, but not firewalld.	2014-11-06 22:40:34 -05:00
Colin Walters	13cc8ee768	atomic: Switch /boot to ext4 For some reason Anaconda in Fedora rejects XFS as /boot, even though that's what RHEL defaults to.	2014-11-05 12:39:31 -05:00
Colin Walters	4bc31dd88e	cloud-atomic: Drop yum/rpm bits from %post While it makes sense to import the GPG key, it has to be done as part of the treecompose, because it'll drop out of the rpmdb on the next upgrade. For yum, it was run as part of the treecompose, not Anaconda, so there's already no history.	2014-11-05 11:43:18 -05:00
Colin Walters	11c22f0c8d	cloud-atomic: Use LVM by default in combination with docker-storage-setup This will allow flexible expansion of direct Docker LVM.	2014-11-05 11:43:13 -05:00
Adam Williamson	1dddaeebc4	...and fix SDDM one more time: correct name of Plasma session	2014-10-28 11:41:38 -07:00
Adam Williamson	73543397cf	fix SDDM config write to not use 'EOF' It's nested in another cat << EOF, so can't use the same string.	2014-10-28 11:41:38 -07:00
Adam Williamson	ab93ba68cb	update autologin conf for SDDM changes (from mbriza, #1149610 )	2014-10-28 11:41:38 -07:00
Rex Dieter	bf576a02b1	kde-live-kde: rely on @kde-office, @kde-education groups instead of listing individual packages	2014-10-25 14:23:59 -05:00
Rex Dieter	48ac6d329a	kde-livecd: rely on @kde-office, @kde-education groups	2014-10-25 14:21:15 -05:00
raveit65	9842b6ce72	Merge branch 'f21' of ssh://git.fedorahosted.org/git/spin-kickstarts into f21	2014-10-25 00:48:02 +02:00
raveit65	bd2c3cd565	mate-live: reduce size again	2014-10-25 00:47:33 +02:00
raveit65	783c32d6fa	mate live: some more drops for size	2014-10-24 17:12:40 +02:00
Kalev Lember	be9216200b	l10n: Adapt for Desktop -> Workstation rename Rename the l10n kickstarts to match the Workstation kickstart file name and update includes.	2014-10-24 16:32:15 +02:00
Adam Williamson	35d3a0f008	also put fedora-release-nonproduct in fedora-arm-base.ks to fix the generic problem for Beta	2014-10-23 10:15:13 -07:00
Kevin Kofler	1c7da1d744	fedora-livecd-kde.ks: update size target in the header comment It was increased from 1 GB to 1.4 GB (MiniDVD) by a KDE SIG vote.	2014-10-19 04:38:04 +02:00
Kevin Kofler	537415a58c	fedora-livecd-kde.ks: remove obsolete nhn-nanum-gothic-fonts blacklist comps now only references the new naver-nanum-gothic-fonts name, so we need to blacklist only that one.	2014-10-19 04:35:05 +02:00
Kalev Lember	f50ad757d3	Revert "workstation: Pull in all of workstation-product-environment" Turns out the @^ construction for pulling in comps environment groups doesn't work in kickstart, for reasons unknown. This reverts commit `6c3c08f442`.	2014-10-18 23:02:40 +02:00
Kalev Lember	b9dc5f25e9	live base: Install fedora-release-nonproduct for non-product lives Add fedora-release-nonproduct to fedora-live-base.ks to ensure it gets pulled in for all spins. In order to avoid it getting pulled in to the Workstation product that is also based on fedora-live-base.ks, explicitly exclude fedora-release-nonproduct in workstation kickstart file. https://bugzilla.redhat.com/show_bug.cgi?id=1154235	2014-10-18 15:37:15 +02:00
Kalev Lember	6c3c08f442	workstation: Pull in all of workstation-product-environment ... instead of listing individual groups manually in the kickstart file.	2014-10-18 15:21:38 +02:00
Peter Robinson	7f12fba617	SOAS: update from gconf to gsettings	2014-10-17 17:32:26 +01:00
Peter Robinson	ac6ae65e82	ARM minimal: ensure we get fedora-release	2014-10-17 17:23:50 +01:00
Matthew Miller	5f29e730a3	updated dd extlinux mbr during post as temporary workaround for bug #1147998	2014-10-15 09:24:48 -04:00
Bruno Wolff III	d034bb6c58	Revert "design: add LuxRender and YaraRay plugin for Blender" This reverts commit `6e96869ce3`, reversing changes made to `9142cc25d5`.	2014-10-15 06:28:50 -05:00
Bruno Wolff III	de82df00d2	Revert "dd extlinux mbr during post as temporary workaround for bug #1147998 " This reverts commit `58b06553fa`. We need to go back to the broken merge.	2014-10-15 06:26:48 -05:00
Bruno Wolff III	7517d88f12	Revert "Dropping bigdata cloud spin from f21" This reverts commit `1d4a252ed6`. We need to go back to the broken merge.	2014-10-15 06:26:10 -05:00
Matthew Miller	1d4a252ed6	Dropping bigdata cloud spin from f21	2014-10-14 16:02:32 -04:00
Matthew Miller	58b06553fa	dd extlinux mbr during post as temporary workaround for bug #1147998	2014-10-14 16:01:25 -04:00
luya	6e96869ce3	design: add LuxRender and YaraRay plugin for Blender	2014-10-13 23:50:42 -07:00
raveit65	9142cc25d5	xfce: fix typo	2014-10-13 19:09:44 +02:00
raveit65	c405f83139	Merge branch 'f21' of ssh://git.fedorahosted.org/git/spin-kickstarts into f21	2014-10-13 18:58:23 +02:00
raveit65	7fc8b1e738	mate: revert switch to lghtdm-gtk2 greeter, cursor issue is fixed in GTK3 too	2014-10-13 18:57:55 +02:00
Kevin Fenzi	4e3090ac91	Try some more removals to get Xfce under size	2014-10-13 10:42:54 -06:00
raveit65	4d4d4bfec0	mate-compiz live: reduce size again	2014-10-13 18:31:25 +02:00
raveit65	4d5a9d254d	fedora-mate-packages: use lightdm-gtk2	2014-10-12 16:34:51 +02:00
raveit65	5ab8aa07a5	mate-compiz: reduce size for live image	2014-10-12 16:31:12 +02:00
raveit65	8b4104df48	mate-compiz: remove hack to avoid theme issues with anaconda	2014-10-12 12:13:52 +02:00
Bruno Wolff III	bc53b8f330	Remove supertuxcart to get under size again	2014-10-11 01:05:12 -05:00
Kevin Fenzi	cb22c2bb38	Try and prune some more space on Xfce spin	2014-10-05 11:04:38 -06:00
Peter Robinson	a1a2f5cd42	SoaS: fix naming (once and for all)	2014-10-03 10:32:18 +01:00
Matthew Miller	0c244663aa	put the remove-firewalld code back -- apparently still needed and having it there is breaking openstack	2014-10-02 13:22:33 -04:00
Kalev Lember	88db72a1c3	workstation: Sync the list of favourite apps with upstream	2014-10-01 17:47:57 +02:00
raveit65	5664c40cb7	Mate:remove dev package compiz-bcop	2014-09-28 18:41:29 +02:00
Kevin Fenzi	c06f5827b4	Drop some more large ibus stuff to try and get back under size on xfce.	2014-09-27 12:06:12 -06:00
Matthew Miller	206f1381a8	only english to keep the locale archive down until there's a better solution	2014-09-27 09:07:04 -04:00
Rex Dieter	fde11da6b9	kde: -system-config-services (prefer kcm_systemd)	2014-09-26 20:33:23 -05:00
Rex Dieter	5b4799f0ca	kde: -system-config-users update comment about gnome-disk-utility add comment about removing system-config-date someday	2014-09-26 20:21:25 -05:00
Peter Robinson	39a7ec54f3	SoaS: reduce image size	2014-09-21 23:09:02 +01:00
Adam Williamson	868c520f22	from spot: add comfortaa fonts to live-base to fix #1116497	2014-09-19 11:09:43 -07:00
Kevin Kofler	2e65469215	fedora-livecd-kde.ks: update CJK font blacklist (#1142512 ) Also change the comment to document the limit as 1 GB (as listed in the specs) rather than 1 GiB.	2014-09-18 00:09:52 +02:00
Rex Dieter	68ff5d0c2f	mate: fix fallout from kickstart renaming should help fix recent mate spin compose failures	2014-09-17 12:39:19 -05:00
Adam Williamson	6418fc0d69	from kparal: fix Test Day browser configuration	2014-09-15 09:09:24 -07:00
Dennis Gilmore	a89507d1c5	CLOUD: install the environment correctly	2014-09-11 18:43:54 -05:00
Adam Williamson	01a5938995	fix exclusion of generic packages to not also exclude generic-jms-ra	2014-09-11 15:13:56 -07:00
Adam Williamson	e304b8cf57	explain why it's not safe to drop jruby	2014-09-11 15:03:20 -07:00
Dennis Gilmore	7b3a3e4371	cloud: do not explicitly remove jruby	2014-09-11 16:58:35 -05:00
Dennis Gilmore	befa9fb626	rename kickstarts for new naming policy	2014-09-10 19:01:45 -05:00
Dennis Gilmore	266b511099	make sure all the groups from the cloud-serevr-environment are in the install tree	2014-09-10 13:12:41 -05:00
Dennis Gilmore	6d6b26c485	CLOUD: install the cloud-server-environment, dont't install firewalld select the cloud-server-environment instead of the different groups. don't install and uninstall firewalld since anaconda allows us to not need it	2014-09-10 13:06:29 -05:00
Dennis Gilmore	0e3c39900a	Revert "docker: Add fakesystemd to %packages to keep systemd out of base image" This reverts commit `f42fe5d85a`.	2014-09-10 13:03:29 -05:00
Matthew Miller	ec10c9919b	fixes from Ian McLeod to make composes work using new scheme. NOTE: this WILL NOT WORK without other changes to coms and spin/install (but the current ones are broken anyway so I'm committing this). See https://lists.fedoraproject.org/pipermail/cloud/2014-September/004207.html for details	2014-09-09 14:09:55 -04:00
raveit65	0fc5d88112	mate livecd: clean up file list	2014-09-07 08:46:29 +02:00
raveit65	cbb3d8a73d	f21, mate-compiz: temporarily fix for theme issue with anaconda rhbz 1136994	2014-09-07 08:45:39 +02:00
Adam Williamson	b599382295	we don't need to nix hwclock-save.service any more... ...because systemd dropped it in 2011: http://lists.freedesktop.org/archives/systemd-commits/2011-May/001088.html	2014-09-06 18:13:28 -07:00
Vaclav Pavlin	f42fe5d85a	docker: Add fakesystemd to %packages to keep systemd out of base image	2014-09-05 08:37:42 -05:00
Stephen Gallagher	c251866101	Add the server environment to the fedora-install-server.ks	2014-09-04 10:50:46 -04:00
Stephen Gallagher	bba84da202	Add @domain-client to the Fedora Server kickstart Also drop @multimedia as we don't need it on Server	2014-09-03 20:04:34 -04:00
Matthew Miller	38dbba6109	use 'cmdline' for text-based install for docker image	2014-09-03 13:19:25 -04:00
Adam Williamson	fe13dc4352	set up tmpfs in fstab, not livesys service (fixes #1135475 )	2014-09-02 09:28:29 -07:00
Kalev Lember	12d37364c7	workstation: Use the package list from workstation-packages.ks for netinstall https://bugzilla.redhat.com/show_bug.cgi?id=1134524	2014-08-29 17:51:05 +02:00
Kalev Lember	16955ef3bd	live-base: Drop a redundant package inclusion Don't explicitly include qemu-guest-agent; it's is already listed in @guest-desktop-agents comps group that is also pulled in to fedora-live-base.	2014-08-29 16:53:26 +02:00
Kalev Lember	9d686ac5e1	workstation: Sync groups with workstation-product-environment in comps	2014-08-29 14:34:04 +02:00
Kalev Lember	82584a7784	workstation: Rely on comps for package selection Drop most package removals / additions from the kickstart file and rely on the @workstation-product comps group pulling in the correct packages. We'll need package selection done in comps in order to make Workstation netinstall work properly. https://bugzilla.redhat.com/show_bug.cgi?id=1134524	2014-08-29 14:33:24 +02:00
Kalev Lember	8b87f019ee	workstation: Install the workstation-product group	2014-08-26 23:26:47 +02:00
Dennis Gilmore	311c0765c4	make sure cloud install tree has heat-cfntools TODO, fix in a much better way	2014-08-26 00:18:56 -05:00
Dennis Gilmore	33858e6641	make sure that teh cloud and workstation install trees do not remove java	2014-08-26 00:14:57 -05:00
Kevin Fenzi	6efe052b72	First cut at reducing size of Xfce spin this cycle.	2014-08-23 11:09:01 -06:00
Dennis Gilmore	73c399b57d	atomic folks decided to willy nilly change things so adjust appropriately	2014-08-22 11:27:22 -05:00
Colin Walters	b078e8354d	atomic: Switch to autopart We actually want LVM for atomic by default, since it allows a lot more storage flexibility.	2014-08-21 17:30:38 -05:00
Dennis Gilmore	5ae38874c7	use eth0 for the device	2014-08-21 17:28:38 -05:00
Dennis Gilmore	b777098d3f	attempt to install an atomic tree in	2014-08-21 10:15:30 -05:00
Dennis Gilmore	98c48cb2b2	use link as the device for netwrok in the cloud images	2014-08-20 10:47:17 -05:00
Elad Alfassa	bdb9c51771	workstation: Don't install icedtea-web by default icedtea-web clutters the application view with two launchers for config dialogs which are not really apps as we define the term. It used to be excluded previously but accidentally slipped back in with the live-desktop -> live-workstation kickstart renames; this commit takes it out again. https://bugzilla.redhat.com/show_bug.cgi?id=1131248	2014-08-19 08:51:17 +02:00
Bastien Nocera	fc3e80cf99	workstation: Install workstation firewalld config So that we use our workstation specific firewall: http://www.hadess.net/2014/06/firewalls-and-per-network-sharing.html	2014-08-12 13:03:21 +02:00
Matthew Miller	deb275b95f	there will be no bigdata image for f21 (feature not complete)	2014-08-06 17:48:36 +02:00
Dennis Gilmore	da35a8e411	license files have moved, and we no longer ship the collection as GPL but MIT	2014-08-01 12:15:23 -05:00
Dennis Gilmore	8fa093cdc8	fix up the options to the bootloader config, make the rootfs smaller.	2014-07-30 02:23:41 -05:00
Vaclav Pavlin	9407e29795	Add kickstart for Docker base image	2014-07-29 09:42:19 -05:00
Peter Robinson	587bbba38f	remove growroot in arm images to test 1109603	2014-07-22 21:57:03 +01:00
Miloslav Trmač	bd9f635d7a	Server: Use server-product-environment by default Most importantly, cause fedora-release-server to be installed.	2014-07-21 17:30:00 +02:00
Matthew Miller	bee1c037a1	put experimental cloud spin back to same as base cloud spin exept for i18n/docs	2014-07-11 15:48:11 -04:00
Matthew Miller	d7ab22af4f	fedora-release-cloud in cloud images	2014-07-11 15:48:04 -04:00
Dennis Gilmore	9b1cc5c734	setup repos for f21 being branched	2014-07-10 20:59:46 -05:00