Cinnamon - correct gnome metadata for extra backgrounds and add basic backgrounds

Signed-off-by: Adam Williamson <awilliam@redhat.com>

.sparkleshare

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

Makefile

@@ -18,6 +18,8 @@ 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

SparkleShare.txt

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

atomic-installer/lorax-configure-repo.tmpl

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

atomic-installer/lorax-embed-repo.tmpl

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

fedora-aos.ks

@@ -4,7 +4,7 @@
 lang C
 keyboard us
 timezone US/Eastern
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"

fedora-arm-base.ks

@@ -1,20 +1,20 @@
 lang en_US.UTF-8
 #keyboard us
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
 # configure extlinux bootloader
 bootloader extlinux
 
-part /boot --size=512 --fstype ext3
+part /boot --size=512 --fstype ext4
 part swap --size=512 --fstype swap
-part / --size=3000 --fstype ext4
+part / --size=3584 --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 --disabled=network
+services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setup --disabled=network
 
 %include fedora-repo.ks
 
@@ -23,14 +23,13 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 @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
@@ -40,9 +39,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
@@ -57,14 +56,15 @@ 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
 
-/usr/sbin/a-b-c
-
-yum -y remove dracut-config-generic
+dnf -y remove dracut-config-generic
 
 %end
 

fedora-arm-kde.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
 
-part / --size=5000 --fstype ext4
+part / --size=5632 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-mate.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks
 
-part / --size=5000 --fstype ext4
+part / --size=5500 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-minimal.ks

@@ -1,13 +1,18 @@
 %include fedora-arm-base.ks
 
-part swap --size=128 --fstype swap
-part / --size=1400 --fstype ext4
+part /boot --size=512 --fstype ext4
+part swap --size=256 --fstype swap
+part / --size=1279 --fstype ext4
 
 %packages
 -@standard
 -@dial-up
 -initial-setup-gui
 -generic-release*
+-glibc-all-langpacks
+glibc-langpack-en
+iw
+NetworkManager-wifi
 %end
 
 %post
@@ -18,9 +23,5 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-echo -n "Enabling initial-setup text mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
-echo .
-
 %end
 

fedora-arm-server.ks

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

fedora-arm-workstation.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-packages.ks
 
-part / --size=5000 --fstype ext4
+part / --size=5500 --fstype ext4
 
 %packages
 -initial-setup

fedora-arm-xfce.ks

@@ -2,6 +2,8 @@
 %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

fedora-atomic-vagrant.ks

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

fedora-atomic.ks

@@ -1,15 +1,17 @@
-# 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.
+# Fedora Atomic is a cloud-focused spin implementing the Project
+# Atomic patterns.  Note that this replicates the same tree which can
+# now be installed on bare metal.
+
+# This image allocates most space to an LVM-managed thin pool
+# dedicated for Docker containers, and uses docker-storage-setup to
+# dynamically resize storage on boot.
 
 text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -19,7 +21,8 @@ firewall --disabled
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --disabled=network
+services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
@@ -30,14 +33,14 @@ volgroup atomicos pv.01
 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
 
 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/24/ --ref=fedora-atomic/24/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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -45,6 +48,10 @@ 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
+
 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.
@@ -115,5 +122,8 @@ 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
 

fedora-cinnamon-packages.ks

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

fedora-cloud-atomic-pxetolive.ks

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

fedora-cloud-base-arm.ks

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

fedora-cloud-base-ppc.ks

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

fedora-cloud-base-vagrant.ks

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

fedora-cloud-base.ks

@@ -7,16 +7,29 @@
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
-# This kickstart file is designed to be used with appliance-creator and
-# may need slight modification for use with actual anaconda or other tools.
-# We intend to target anaconda-in-a-vm style image building for F20.
+# 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
+#
 
 cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -30,7 +43,7 @@ services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --fstype ext4 --grow
 
 %include fedora-repo.ks
 
@@ -39,20 +52,34 @@ reboot
 # Package list.
 # FIXME: instLangs does not work, so there's a hack below
 # (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-%packages --instLangs=en
+# 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
 
 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
--plymouth
+# Need to also add back plymouth in order to mask failure of
+# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
+#-plymouth
 -NetworkManager
 -iprutils
--kbd
+# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
+# systemd-vconsole-setup.service on boot. Comment out for now
+#-kbd
 -uboot-tools
 -kernel
 -grub2
@@ -103,8 +130,10 @@ 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."
-dnf -C -y erase linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
@@ -142,9 +171,11 @@ 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
@@ -231,5 +262,8 @@ 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
 

fedora-cloud-bigdata.ks

@@ -16,7 +16,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -108,8 +108,10 @@ 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."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.

fedora-cloud-experimental.ks

@@ -7,7 +7,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -99,8 +99,10 @@ 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."
-yum -C -y remove linux-firmware
+rpm -e linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.

fedora-docker-base-arm.ks

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

fedora-docker-base-ppc.ks

@@ -0,0 +1,5 @@
+%include fedora-docker-base.ks
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+part prepboot --fstype="prepboot" --size=4

fedora-docker-base.ks

@@ -2,17 +2,29 @@
 #
 # 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 --location=none
+bootloader --disabled
 timezone --isUtc --nontp Etc/UTC
-rootpw --plaintext qweqwe
+rootpw --lock --iscrypted locked
+user --name=none
 
 keyboard us
-firewall --disable
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --fstype ext4 --grow
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
@@ -21,7 +33,9 @@ bash
 fedora-release
 rootfiles
 vim-minimal
-yum
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+sssd-client
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel
 
@@ -32,13 +46,23 @@ yum
 # 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)

fedora-install-cloud.ks

@@ -1,93 +0,0 @@
-# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# use the source repo, we can't just include fedora-repo.ks
-
-# In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-
-# In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
-
-# Package manifest for the compose.  Uses repo group metadata to translate groups.
-# (default groups for the configured repos are added by --default)
-# @base got renamed to @standard, but @base is still included by default by pungi.
-%packages --default
-
-# pungi is an inclusive depsolver so that multiple packages are brought 
-# in to satisify dependencies and we don't always want that. So we  use
-# an exclusion list to cut out things we don't want
-
--kernel*debug*
--kernel-kdump*
--kernel-tools*
--syslog-ng*
--astronomy-bookmarks
-# generic* would match generic-jms-ra, so don't 'simplify' this
--generic-logos*
--generic-release*
--GConf2-dbus*
--bluez-gnome
--community-mysql*
-# jruby used to be in this list, but springframework-context explicitly
-# requires it, not just 'any ruby implemention' - please check for things
-# on the image that require mvn(org.jruby:jruby) before adding jruby to
-# this list again - adamw 2014/09
-#-jruby
-
-# core
-kernel*
-dracut-*
-
-
-# Things needed for installation
-@anaconda-tools
-fedora-productimg-cloud
--fedora-productimg-server
--fedora-productimg-workstation
-
-# Packages to enable server images to run in cloud environments
-@cloud-server
-@core
-@standard
-@headless-management
-@dogtag
-@directory-server
-@dns-server
-@freeipa-server
-@ftp-server
-@guest-agents
-@ha
-@load-balancer
-@mail-server
-@mysql
-@network-server
-@smb-server
-@sql-server
-@web-server
-
-# Langpacks
-autocorr-*
-hunspell-*
-hyphen-*
-man-pages-*
--gimp-help-*
-
-# Removals
--PackageKit-zif
--zif
-%end

fedora-install-server.ks

@@ -1,141 +0,0 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# use the source repo, we can't just include fedora-repo.ks
-
-# In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-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

fedora-install-workstation.ks

@@ -1,51 +0,0 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# use the source repo, we can't just include fedora-repo.ks
-
-# In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-
-# In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
-
-%include fedora-workstation-packages.ks
-
-# Package manifest for the compose.  Uses repo group metadata to translate groups.
-# (default groups for the configured repos are added by --default)
-# @base got renamed to @standard, but @base is still included by default by pungi.
-%packages --default
-
-# pungi is an inclusive depsolver so that multiple packages are brought 
-# in to satisify dependencies and we don't always want that. So we  use
-# an exclusion list to cut out things we don't want
--kernel*debug*
--kernel-kdump*
--kernel-tools*
--astronomy-bookmarks
--generic*
-
-# core
-kernel*
-
-# Things needed for installation
-@anaconda-tools
--fedora-productimg-cloud
--fedora-productimg-server
-fedora-productimg-workstation
-
-%end

fedora-kde-packages.ks

@@ -1,4 +1,5 @@
 %packages
+@firefox
 @kde-apps
 @kde-desktop
 @kde-media
@@ -8,6 +9,9 @@
 
 ### The KDE-Desktop
 
+### Browser
+qupzilla
+
 ### fixes
 
 # use kde-print-manager instead of system-config-printer

fedora-live-astronomy_kde.ks

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

fedora-live-base.ks

@@ -10,12 +10,16 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
-auth --useshadow --enablemd5
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-part / --size 3072 --fstype ext4
-services --enabled=NetworkManager --disabled=network,sshd
+zerombr
+clearpart --all
+part / --size 5120 --fstype ext4
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
+network --bootproto=dhcp --device=link --activate
+shutdown
 
 %include fedora-repo.ks
 
@@ -24,7 +28,6 @@ services --enabled=NetworkManager --disabled=network,sshd
 @guest-desktop-agents
 @standard
 @core
-@fedora-release-nonproduct
 @fonts
 @input-methods
 @dial-up
@@ -35,6 +38,8 @@ services --enabled=NetworkManager --disabled=network,sshd
 # 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
@@ -48,6 +53,13 @@ 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
@@ -194,6 +206,9 @@ 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
 
@@ -275,7 +290,6 @@ 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
@@ -291,19 +305,21 @@ 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
 
-# forcibly regenerate fontconfig cache (so long as this live image has
-# fontconfig) - see #1169979
-if [ -x /usr/bin/fc-cache ] ; then
-   fc-cache -f
-fi
+echo 'File created by kickstart. See systemd-update-done.service(8).' \
+    | tee /etc/.updated >/var/.updated
+
+# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
+# See bug 1317709
+rm -f /boot/*-rescue*
 
 %end
 

fedora-live-cinnamon.ks

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

fedora-live-design_suite.ks

@@ -9,80 +9,28 @@
 
 %include fedora-live-workstation.ks
 
-#DVD size partition
-part / --size 8192
+# Size partition
+part / --size 14336
 
 %packages
+# Switch to groups for design suite
+@design-suite
 
-# graphics
-blender
-LuxRender-blender
-YafaRay-blender
-bluefish 
-#cinepaint
-#cmyktool
-colord-extra-profiles
-darktable
-dia
-entangle
-fontforge
-font-manager 
-gimp
-gimp-elsamuko
-gimp-*-plugin
-gimp-data-extras
-gimp-gap
-gimp-paint-studio
-gimp-high-pass-filter
-gimp-normalmap
-gimp-resynthesizer
-gimp-separate+
-gpick
-GraphicsMagick
-gmic-gimp
-hugin 
-ImageMagick
-inkscape
-inkscape-sozi
-inkscape-table
-mypaint
-nautilus-image-converter
-optipng
-phatch
-screenruler
-simple-scan
-scribus
-shutter
-synfigstudio
-xournal
+# Preview Gnome Photos
+gnome-photos
 
-# office
-vym
-pdfmod
-pdfshuffler  
+# Add gthumb for renaming group files
+gthumb
 
-# internet
-filezilla
-sparkleshare
-sshpass
-
-# audio & video
-audacity
-pitivi
-
-# fonts
-aajohan-comfortaa-fonts
-adobe-source-sans-pro-fonts
-campivisivi-titillium-fonts
-lato-fonts
-opens-sans-fonts
-overpass-fonts
+# Extra wallpapers
+f23-backgrounds-extras-base
+f23-backgrounds-extras-gnome
+f24-backgrounds-extras-base
+f24-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
--gthumb
 -eog
--gnome-photos
 -rdesktop
 
 %end
@@ -91,7 +39,7 @@ overpass-fonts
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.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', 'gnome-photos.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE
 
 # Add link to lists of tutorials
@@ -100,17 +48,40 @@ 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 http://fedoraproject.org/wiki/Design_Suite/Tutorials
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
+# 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
-

fedora-live-games.ks

@@ -4,10 +4,10 @@
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 
-%include fedora-livecd-xfce.ks
+%include fedora-live-xfce.ks
 
 # The recommended part size for DVDs is too close to use for the games spin
-part / --size 10240
+part / --size 14336
 
 %packages
 
@@ -20,6 +20,9 @@ part / --size 10240
 # 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
 
@@ -32,17 +35,17 @@ armacycles-ad
 asc
 asc-music
 astromenace
-beneath-a-steel-sky-cd
+# beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
-flight-of-the-amazon-queen-cd
+# flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
-freedroidrpg
+# freedroidrpg cut for size
 frozen-bubble
 gl-117
 glob2
@@ -55,22 +58,22 @@ nethack-vultures
 netpanzer
 #neverball #cut for size
 nogravity
-pinball
+#pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 supertux
 #supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
-worminator
-warmux
+# worminator # Would pull in fluid-soundfont-lite-patches
+# warmux - Cut for size
 xmoto
 
 # traditional (small)
 
 abe
-alex4
-ballz
+# alex4 # Would pull in fluid-soundfont-lite-patches
+# ballz # Would pull in fluid-soundfont-lite-patches
 blobwars
 bombardier
 cdogs-sdl
@@ -85,19 +88,19 @@ hedgewars
 kcheckers
 knights
 lbrickbuster2
-liquidwar
+# liquidwar # Would pull in fluid-soundfont-lite-patches
 londonlaw
 lordsawar
-lure
-machineball
+# lure scummvm games cut for size
+# machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
 pachi
 pioneers
 quarry
-Ri-li
+# Ri-li cut for size
 rogue
-scorchwentbonkers
+# scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 seahorse-adventures
 solarwolf
 sopwith
@@ -109,11 +112,11 @@ xblast
 
 auriferous
 alienblaster
-duel3
+# duel3 # Would pull in fluid-soundfont-lite-patches
 lmarbles
 powermanga
-raidem
-raidem-music
+# raidem # Would pull in fluid-soundfont-lite-patches
+# raidem-music # Would pull in fluid-soundfont-lite-patches
 trackballs
 trackballs-music
 
@@ -123,7 +126,7 @@ ballbuster
 CriticalMass
 dd2
 KoboDeluxe
-lacewing
+# lacewing # Would pull in fluid-soundfont-lite-patches
 Maelstrom
 methane
 njam
@@ -132,13 +135,13 @@ shippy
 tecnoballz
 wordwarvi
 xgalaxy
-zasx
+# zasx # Would pull in fluid-soundfont-lite-patches
 
 # falling blocks games (small) 
 
 amoebax
 crack-attack
-crystal-stacker
+# crystal-stacker # Would pull in fluid-soundfont-lite-patches
 gemdropx
 gweled
 
@@ -150,7 +153,7 @@ pingus
 # puzzles (small)
 
 escape
-gbrainy
+# gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
 pipenightdreams

fedora-live-jam_kde.ks

@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>
 
-%include fedora-livecd-kde.ks
+%include fedora-live-kde.ks
 
 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -40,6 +40,7 @@ jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
+ffado
 
 #pulse
 pulseaudio-module-jack
@@ -76,7 +77,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour3
+ardour4
 rosegarden4
 seq24
 muse
@@ -167,9 +168,6 @@ rtirq
 japa
 radium-compressor
 
-#streaming
-idjc
-
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
@@ -199,12 +197,12 @@ thunderbird
 %post
 
 #setup kickoff favorites
-/bin/mkdir -p /etc/skel/.kde/share/config
+/bin/mkdir -p /etc/skel/.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/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.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/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
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<EOF  >> /etc/skel/.kde/share/config/kickoffrc
+cat <<EOF  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 EOF

fedora-live-kde-base.ks

@@ -7,71 +7,46 @@
 
 %post
 
-# 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)
+# set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
+include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="oxygen-gtk"
+gtk-theme-name="Adwaita"
 EOF
 mkdir -p /root/.config/gtk-3.0
 cat > /root/.config/gtk-3.0/settings.ini << EOF
 [Settings]
-gtk-theme-name = oxygen-gtk
+gtk-theme-name = Adwaita
 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=kde-plasma.desktop/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
-Session=kde-plasma.desktop
+Session=plasma.desktop
 SDDM_EOF
 fi
 
 # add liveinst.desktop to favorites menu
-mkdir -p /home/liveuser/.kde/share/config/
-cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.config/
+cat > /home/liveuser/.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
+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
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
+# set executable bit disable KDE security warning
 chmod +x /usr/share/applications/liveinst.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/
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
 
 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
@@ -80,23 +55,14 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# 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 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 baloo
-cat > /home/liveuser/.kde/share/config/baloofilerc << BALOO_EOF
+cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 [Basic Settings]
 Indexing-Enabled=false
 BALOO_EOF
@@ -107,24 +73,16 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
-# Disable nepomuk
-cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
-[Basic Settings]
-Start Nepomuk=false
-
-[Service-nepomukfileindexer]
-autostart=false
-NEPOMUK_EOF
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 
-# small hack to enable plasma-netbook workspace on boot
-if strstr "\`cat /proc/cmdline\`" netbook ; then
-   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
-   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
-fi
 EOF
 
 %end

fedora-live-kde.ks

@@ -1,8 +1,7 @@
-# fedora-live-kde.ks
+# fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
-#   see fedora-livecd-kde.ks for the default 1.4 GiB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -12,33 +11,61 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=8192
+part / --size=6144
 
 
 %packages
-# ship KDE wallpapers instead of GNOME ones
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
 -desktop-backgrounds-basic
-kde-wallpapers
+-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
 
-# Additional packages that are not default in kde-desktop but useful
+# Additional packages that are not default in kde-* groups, 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)
 
-# kdeedu apps
-@kde-education
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
 
-# 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
+### space issues
 
-# KDE 4 translations
-kde-l10n-*
-calligra-l10n-*
+# 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
 
 ## avoid serious bugs by omitting broken stuff
 

fedora-live-mate_compiz.ks

@@ -1,11 +1,50 @@
+# 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 4096 
+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
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF

fedora-live-minimization.ks

@@ -7,7 +7,6 @@
 -mpage
 -sox
 -hplip
--hpijs
 -numactl
 -isdn4k-utils
 -autofs

fedora-live-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 10240
+part / --size 10752
 
 %packages
 # Start with GNOME

fedora-live-scientific_kde.ks

@@ -1,11 +1,9 @@
-#fedora-livedvd-scientific-kde.ks
-# With KDE Desktop
+# Fedora Scientific 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://fedoraproject.org/wiki/Scientific_Spin
-# Web: http://spins.fedoraproject.org/scientific-kde/
+# Web: https://labs.fedoraproject.org/en/scientific/
 
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
@@ -13,7 +11,7 @@
 %include fedora-live-kde.ks
 
 # The recommended part size for DVDs is too close to use for the scientific spin
-part / --size 12288
+part / --size 14500
 
 %packages
 
@@ -25,10 +23,8 @@ scilab
 scilab-devel
 scilab-doc
 
-# sagemath
-# BZ #1006230 should fix this
-#sagemath
-#sagemath-notebook
+# Remove sagemath explicitly?
+-sagemath
 
 #Devel tools
 
@@ -88,6 +84,10 @@ rkward
 # GUI for Octave
 qtoctave
 
+# julia
+julia
+julia-doc
+
 # IDEs for the IDE folks
 @eclipse
 spyder
@@ -110,8 +110,6 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
-pvm
-pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi
@@ -155,8 +153,8 @@ xzgv
 gimp
 ggobi
 ggobi-devel
-g3data
-Mayavi
+#g3data
+#Mayavi
 
 #Misc. Utils
 screen
@@ -175,4 +173,4 @@ firefox
 
 %post
 
-%end
+%end

fedora-live-security.ks

@@ -6,10 +6,9 @@
 # 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!
+#   many thanks, especially to Christoph Wickert!
 #   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! 
@@ -75,7 +74,6 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
--picviz-gui
 -proxychains
 -pyrit
 -raddump
@@ -88,18 +86,13 @@ gnome-keyring-pam
 -tcpreplay
 -tripwire
 -wipe
-
-# Is not available for OpenVAS-7. No longer supported by upstream.
--openvas-client 
+-zmap
 
 %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

fedora-live-soas.ks

@@ -51,6 +51,7 @@ 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
@@ -58,6 +59,7 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
+org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries

fedora-live-workstation.ks

@@ -4,14 +4,12 @@
 
 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
+%include snippets/packagekit-cached-metadata.ks
 
-part / --size 6144 
+part / --size 6656
 
 %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
 
 

fedora-live-xfce.ks

@@ -16,9 +16,6 @@
 %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
@@ -33,7 +30,7 @@ mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
-WebBrowser=midori
+WebBrowser=firefox
 FOE
 
 # disable screensaver locking (#674410)

fedora-livecd-kde.ks

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

fedora-livecd-mate_compiz.ks

@@ -1,112 +0,0 @@
-# Desktop with customizations to fit in a CD (package removals, etc.)
-# Maintained by the Fedora Desktop SIG:
-# http://fedoraproject.org/wiki/SIGs/Desktop
-# mailto:desktop@lists.fedoraproject.org
-
-%include fedora-live-mate_compiz.ks
-%include fedora-live-minimization.ks
-
-%packages
-
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-mate-netspeed
-
-# system tools
-system-config-printer
-system-config-printer-applet
-
-
-# audio player
-audacious
-
-# 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-user-docs
--gstreamer1-plugins-good
--gstreamer1-plugins-bad-free
--gstreamer-plugins-good
--gstreamer-plugins-bad-free
--gstreamer-plugins-espeak
--@guest-desktop-agents
--@libreoffice
--@mate-applications
--mate-icon-theme-faenza
--NetworkManager-bluetooth
--samba-client
--ibus-chewing
--libical
--OpenEXR-libs
-
-# Drop oversized fonts that aren't needed
--gnu-free-mono-fonts
--gnu-free-fonts-common
--gnu-free-serif-fonts
--gnu-free-sans-fonts
--stix-fonts
-
-# Drop the Java plugin
--icedtea-web
--java-1.8.0-openjdk
-
-# Drop things that pull in perl
--linux-atm
-
-# Dictionaries are big
-# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
-# strong preference to giving it a go on #fedora-desktop.
-# also see http://bugzilla.gnome.org/681084
--aspell-*
--man-pages*
--words
-
-# Help and art can be big, too
--gnome-user-docs
--evolution-help
--desktop-backgrounds-basic
--*backgrounds-extras
-
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
-
--minicom
-
--jwhois
--mtr
--pinfo
--rsh
--ypbind
--yp-tools
--ntsysv
-
-# Drop some system-config things
--system-config-rootpassword
--system-config-services
--policycoreutils-gui
-
-%end
-
-%post
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
-%end

fedora-livedvd-electronic_lab.ks

@@ -1,59 +0,0 @@
-# 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-live-workstation.ks
-
-# DVD payload
-part / --size 10240
-
-%packages
-
-@electronic-lab
-
-# Support for the Milkymist hardware community
-@milkymist
-
-
-# Office
-dia
-vym
-libreoffice-writer
-libreoffice-calc
-libreoffice-impress
-#libreoffice-extendedPDF
-planner
-graphviz
-
-
-# debugging tools
-make
-gdb
-valgrind
-kdbg
-wireshark-gnome
-qemu
-
-
-# EDA/CAD department
-perl-Test-Pod
-perl-Test-Pod-Coverage
-
-
-# Removing unnecessary packages from the desktop spin
--abiword
--@games
--gimp
--gimp-libs
--gimp-data-extras
--kdebluetooth
--kbluetooth
--rdesktop
-
-%end
-
-%post
-
-%end

fedora-mate-packages.ks

@@ -1,7 +1,5 @@
 %packages
 -PackageKit*                # we switched to yumex, so we don't need this
--ConsoleKit                 # ConsoleKit is deprecated
--ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
 @mate
 compiz
@@ -9,22 +7,51 @@ compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
-compiz-plugins-unsupported
-compiz-mate
+compiz-plugins-experimental
 libcompizconfig
 compiz-plugins-main
 ccsm
+simple-ccsm
 emerald-themes
 emerald
 fusion-icon
-fusion-icon-gtk
-@libreoffice
 @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
+@libreoffice
+
+# dsl tools
+rp-pppoe
+
+# some tools
+p7zip
+p7zip-plugins
 
 # 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

fedora-repo-not-rawhide.ks

@@ -1,3 +1,4 @@
-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
+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

fedora-repo-rawhide.ks

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

fedora-repo.ks

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

fedora-soas-packages.ks

@@ -32,6 +32,7 @@
 -abrt-cli
 -ibus*
 -hyperv-daemons
+-webkitgtk4-plugin-process-gtk2
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -76,9 +77,6 @@ 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

fedora-virt-server.ks.in

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

fedora-workstation-packages.ks

@@ -2,7 +2,6 @@
 
 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
--@fedora-release-nonproduct
 -@input-methods
 -@standard
 
@@ -10,7 +9,9 @@
 # workstation-product-environment in comps
 @base-x
 @core
+@firefox
 @fonts
+@gnome-desktop
 @guest-desktop-agents
 @hardware-support
 @libreoffice

fedora-xfce-packages.ks

@@ -21,9 +21,17 @@
 
 # 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

snippets/autologin-gdm.ks

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

snippets/autologin-kdm.ks

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

snippets/config-developer.ks

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

snippets/config-electronic-lab.ks

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

snippets/config-kde-gnome-keyring.ks

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

snippets/config-tracker.ks

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

snippets/eeepc900-modifications.ks

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

snippets/packagekit-cached-metadata.ks

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

snippets/repository-debuginfo.ks

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

snippets/screensaver-gnome.ks

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

snippets/screensaver-kde.ks

@@ -1,3 +0,0 @@
-# %post modifications to disable KDE screensaver
-
-sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc

snippets/sysconfig-kde.ks

@@ -1,6 +0,0 @@
-# %post modifications to create /etc/sysconfig/desktop for KDE
-
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF

snippets/sysconfig-xfce.ks

@@ -1,5 +0,0 @@
-# %post modifications to create /etc/sysconfig/desktop for XFCE
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/startxfce4
-EOF