design-suite: fix design suite info

Signed-off-by: Dennis Gilmore <dennis@ausil.us>

SparkleShare.txt

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

@@ -4,5 +4,5 @@
 <%page args="ostree_osname, ostree_ref"/>
 append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
 append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'\n%end\n"
+append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\n%end\n"
 

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"

fedora-arm-base.ks

@@ -1,13 +1,13 @@
 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=300 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
 
@@ -23,6 +23,7 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 @standard
 @hardware-support
 @dial-up
+@fedora-release-nonproduct
 
 kernel
 

fedora-arm-minimal.ks

@@ -1,6 +1,5 @@
 %include fedora-arm-base.ks
 
-part /boot --size=300 --fstype ext4
 part swap --size=256 --fstype swap
 part / --size=1200 --fstype ext4
 

fedora-arm-server.ks

@@ -4,6 +4,7 @@
 part / --size=3000 --fstype xfs
 
 %packages
+-@fedora-release-nonproduct
 -@dial-up
 # install the default groups for the server evironment since installing the environment is not working
 @server-product

fedora-arm-xfce.ks

@@ -1,8 +1,7 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-
-part / --size=4000 --fstype ext4
+part / --size=3500 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-cinnamon-packages.ks

@@ -1,28 +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
-
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
-# save some space
--fedora-icon-theme
--PackageKit*                # we switched to yumex, so we don't need this
-
-%end

fedora-cloud-atomic-pxetolive.ks

@@ -17,7 +17,7 @@ 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/23/ --ref=fedora-atomic/f23/x86_64/docker-host
+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
 

fedora-cloud-atomic-vagrant.ks

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

fedora-cloud-atomic.ks

@@ -11,7 +11,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
@@ -33,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/23/ --ref=fedora-atomic/f23/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
 
 reboot
 
 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -48,9 +48,9 @@ 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
+# We can lead the way with the internal DHCP, see
+# https://lists.fedoraproject.org/pipermail/cloud/2015-March/005119.html
+echo "dhcp=internal" >> /etc/NetworkManager/NetworkManager.conf
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -59,13 +59,6 @@ echo -n "Getty fixes"
 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*
@@ -122,8 +115,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.)"
 
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
 %end
 

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # 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"
+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
@@ -28,10 +28,6 @@ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,11520
 # 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

fedora-cloud-base.ks

@@ -7,43 +7,30 @@
 # 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
 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 --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4 --grow
+part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
@@ -52,12 +39,7 @@ 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
@@ -67,16 +49,13 @@ kernel-core
 
 # 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
 
 %end
 
@@ -113,6 +92,9 @@ 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"
@@ -121,10 +103,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
+dnf -C -y erase linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
@@ -231,12 +211,21 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*
 
 
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
 
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
+chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
+chattr +i /boot/extlinux/ldlinux.sys
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -244,8 +233,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
 

fedora-cloud-bigdata.ks

@@ -16,7 +16,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
@@ -108,10 +108,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.

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.

fedora-docker-base.ks

@@ -1,4 +1,4 @@
-# This is a minimal Fedora install designed to serve as a Docker base image.
+# This is a minimal Fedora install designed to serve as a Docker base image. 
 #
 # To keep this image minimal it only installs English language. You need to change
 # yum configuration in order to enable other languages.
@@ -9,17 +9,16 @@
 #
 # 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
+bootloader --location=none
 timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
+rootpw --plaintext qweqwe
 
 keyboard us
 zerombr
@@ -35,7 +34,6 @@ rootfiles
 vim-minimal
 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
 
@@ -46,9 +44,6 @@ 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
 
@@ -76,10 +71,6 @@ 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
 
-# Fix /run/lock breakage since it's not tmpfs in docker
-umount /run
-systemd-tmpfiles --create --boot
-
 rm -f /etc/machine-id
 
 %end

fedora-install-server.ks

@@ -71,7 +71,6 @@ dracut-*
 @standard
 @core
 @hardware-support
-@networkmanager-submodules
 
 # Fedora Server.
 # Including this causes the fedora-release-server package to be included,
@@ -92,6 +91,7 @@ dracut-*
 # Web Server environment
 @haproxy
 @mongodb
+@perl-web
 @python-web
 @php
 @rubyonrails
@@ -107,7 +107,7 @@ dracut-*
 @network-server
 @printing
 @smb-server
-@virtualization-headless
+@virtualization
 @load-balancer
 @ha
 

fedora-kde-packages.ks

@@ -8,9 +8,6 @@
 
 ### The KDE-Desktop
 
-### Browser
-firefox
-
 ### fixes
 
 # use kde-print-manager instead of system-config-printer

fedora-live-astronomy_kde.ks

@@ -1,164 +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 12288
-
-%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
-kstars
-skychart
-skychart-data-dso
-skychart-data-stars
-stellarium
-
-# misc. astronomy
-celestia
-xvarstar
-
-# Some astro environment stuff
-astronomy-bookmarks
-astronomy-menus
-astronomy-menus-toplevel
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-# for astronomy
-cfitsio-devel
-CCfits-devel
-libnova-devel
-wcslib-devel
-
-
-#python 2 tools/libraries not included from the groups
-python-tools
-python-ipython
-python-ipython-console
-python-ipython-notebook
-sympy
-python-networkx
-python-pandas
-# Python astronomy
-astropy-tools
-python-astropy
-python-astroML
-python-photutils
-python-sep
-pyephem
-APLpy
-ATpy
-
-
-#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-APLpy
-python3-ATpy
-python3-photutils
-python3-sep
-
-# matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-qt5
-python-matplotlib-tk
-python3-matplotlib-qt4
-python3-matplotlib-qt5
-python3-matplotlib-tk
-
-
-# Python IDE very useful for scientific use
-spyder
-
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-gimp
-inkscape
-kst
-kst-docs
-kst-fits
-scidavis
-
-#Misc. Utils
-ImageMagick
-kate
-kate-plugins
-rlwrap
-screen
-
-# 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,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
 part / --size 4096 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=network,sshd
+services --enabled=NetworkManager --disabled=network,sshd
 
 %include fedora-repo.ks
 
@@ -24,6 +24,7 @@ services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 @guest-desktop-agents
 @standard
 @core
+@fedora-release-nonproduct
 @fonts
 @input-methods
 @dial-up
@@ -47,9 +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
-
 %end
 
 %post
@@ -196,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
 
@@ -275,15 +270,6 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
 
-# As livecd-creator is still yum based, we only get yum's yumdb during the
-# image compose. Migrate this over to dnf so that dnf and PackageKit can keep
-# track where packages came from.
-if [ ! -d /var/lib/dnf ]; then
-  mkdir -p /var/lib/dnf
-  mv /var/lib/yum/yumdb /var/lib/dnf/
-  rm -rf /var/lib/yum/
-fi
-
 # make it so that we don't do writing to the overlay for things which
 # are just tmpdirs/caches
 # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475

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

fedora-live-design_suite.ks

@@ -15,7 +15,7 @@ part / --size 8192
 %packages
 # graphics
 blender
-#LuxRender-blender
+LuxRender-blender
 YafaRay-blender
 bluefish 
 colord-extra-profiles
@@ -75,10 +75,6 @@ lato-fonts
 open-sans-fonts
 overpass-fonts
 
-# Extra wallpapers
-f23-backgrounds-extras-base
-f23-backgrounds-extras-gnome
-
 # removal of unneeded applications
 -gnome-boxes
 -gthumb
@@ -101,7 +97,7 @@ 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;
@@ -114,7 +110,11 @@ cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
 Name=Design Suite Info
 GenericName=About Design Suite
 Comment=Wiki page of Design Suite
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite
+Name=About Design Team 
+GenericName=About Design Team 
+Comment=Wiki page of Design Team
+>>>>>>> d4d001c54999e8f5401ca3f7b5d9b6a2d0132093
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -126,8 +126,10 @@ cat >> /usr/share/applications/fedora-design-team.desktop << FOE
 [Desktop Entry]
 Name=Design Team Info
 GenericName=About Design Team 
+Name=About Design Suite
+GenericName=About Design Suite Wiki Page
 Comment=Wiki page of Design Team
-Exec=xdg-open https://fedoraproject.org/wiki/Design
+Exec=xdg-open http://fedoraproject.org/wiki/Design
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -138,3 +140,4 @@ chmod a+x /usr/share/applications/fedora-design-team.desktop
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end
+

fedora-live-jam_kde.ks

@@ -40,7 +40,6 @@ jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
-ffado
 
 #pulse
 pulseaudio-module-jack

fedora-live-kde-base.ks

@@ -7,6 +7,12 @@
 
 %post
 
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
 # set default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
@@ -22,6 +28,17 @@ 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
@@ -38,15 +55,23 @@ fi
 mkdir -p /home/liveuser/.config/
 cat > /home/liveuser/.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/kfmclient_html.desktop,/usr/share/applications/kde4/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
-# 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,15 @@ 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
-
 # 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,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,62 +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*
--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
+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-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
+# KDE 4 translations
+kde-l10n-*
+calligra-l10n-*
 
 ## avoid serious bugs by omitting broken stuff
 

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 6144 
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -79,7 +40,4 @@ chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 
-# This is a huge file and things work ok without it
-rm -f /usr/share/icons/HighContrast/icon-theme.cache
-
 %end

fedora-live-workstation.ks

@@ -4,7 +4,6 @@
 
 %include fedora-live-base.ks
 %include fedora-workstation-packages.ks
-%include snippets/packagekit-cached-metadata.ks
 
 part / --size 6144 
 

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

fedora-livecd-mate_compiz.ks

@@ -0,0 +1,77 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-mate_compiz.ks
+%include fedora-live-minimization.ks
+
+%packages
+
+# some apps from mate-applications
+caja-actions
+mate-disk-usage-analyzer
+mate-netspeed
+mate-themes-extras
+
+# more backgrounds
+f22-backgrounds-mate
+f21-backgrounds-extras-base
+f21-backgrounds-extras-mate
+
+# system tools
+system-config-printer
+system-config-printer-applet
+
+# audio player
+audacious
+
+# office
+@libreoffice
+
+# dsl tools
+rp-pppoe
+
+# Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-colord
+-fedora-icon-theme
+-GConf2
+-gnome-bluetooth-libs
+-gnome-icon-theme
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-themes
+-gnome-themes-standard
+-gnome-user-docs
+
+-@mate-applications
+-mate-icon-theme-faenza
+-NetworkManager-bluetooth
+
+# Drop oversized fonts that aren't needed
+
+# Drop things that pull in perl
+
+# Dictionaries are big
+# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
+# strong preference to giving it a go on #fedora-desktop.
+# also see http://bugzilla.gnome.org/681084
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+
+# Legacy cmdline things we don't want
+-telnet
+
+%end
+
+%post
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end

fedora-livedvd-games.ks

@@ -4,7 +4,7 @@
 # - 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 10240
@@ -20,9 +20,6 @@ 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
 
@@ -35,13 +32,13 @@ 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
@@ -65,15 +62,15 @@ supertux
 ultimatestunts
 warzone2100
 wesnoth
-# worminator # Would pull in fluid-soundfont-lite-patches
+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,11 +85,11 @@ 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
@@ -100,7 +97,7 @@ pioneers
 quarry
 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

fedora-livedvd-scientific_kde.ks

@@ -21,9 +21,9 @@ part / --size 12288
 @engineering-and-scientific
 
 # scilab
-#scilab
-#scilab-devel
-#scilab-doc
+scilab
+scilab-devel
+scilab-doc
 
 # sagemath
 # BZ #1006230 should fix this
@@ -110,6 +110,8 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
+pvm
+pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi
@@ -169,6 +171,10 @@ hevea
 #Include Mozilla Firefox
 firefox
 
+# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
+-kde-l10n-*
+-calligra-l10n-*
+
 %end
 
 %post

fedora-mate-packages.ks

@@ -1,4 +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
@@ -14,42 +17,14 @@ ccsm
 emerald-themes
 emerald
 fusion-icon
-@networkmanager-submodules
-blueman
-
-# some apps from mate-applications
-# caja-actions
-mate-disk-usage-analyzer
-
-# more backgrounds
-f23-backgrounds-base
-f23-backgrounds-mate
-f23-backgrounds-extras-base
-
-# system tools
-system-config-printer
-system-config-printer-applet
-lightdm-gtk-greeter-settings
-
-# audio video
-parole
-exaile
-PackageKit-gstreamer-plugin
-
-# office
+fusion-icon-gtk
 @libreoffice
-
-# dsl tools
-rp-pppoe
-
-# drop packages
--PackageKit*                # we switched to yumex, so we don't need this
-
-# blacklist applications which breaks mate-desktop
--audacious
+@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

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

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,7 +10,6 @@
 # workstation-product-environment in comps
 @base-x
 @core
-@firefox
 @fonts
 @guest-desktop-agents
 @hardware-support

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 -a $f ${INSTALL_ROOT}${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/mash/branched/$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/mash/rawhide/$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