Added kickstart file for Astronomy Spin

KDE composes have been failing for weeks due to insufficient
space in the compose root.

.sparkleshare

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

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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\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}

custom/fedora-livedvd-haskell.ks

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

custom/qa-test-day.ks

@@ -3,7 +3,7 @@
 # Contact QA team if you have any improvements for this kickstart:
 # https://fedoraproject.org/wiki/QA
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 
 ## System configuration

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,13 +1,13 @@
 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=300 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
 
@@ -51,7 +51,7 @@ rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-echo "Packages within this LiveCD"
+echo "Packages within this ARM disk image"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*

fedora-arm-kde.ks

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

fedora-arm-minimal.ks

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

fedora-arm-server.ks

@@ -0,0 +1,31 @@
+%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 .
+
+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-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-cinnamon-packages.ks

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

@@ -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-atomic-vagrant.ks

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

fedora-cloud-atomic.ks

@@ -1,37 +1,46 @@
-# 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
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --disabled=network
+services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
 # Atomic differs from cloud - we want LVM
-autopart
+part /boot --size=300 --fstype="ext4"
+part pv.01 --grow
+volgroup atomicos pv.01
+logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
 
 # Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/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/rawhide/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -39,14 +48,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
-
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
+# 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
@@ -105,16 +109,6 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/random-seed
 
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
-
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
 rpm -qa

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
+#
 
-text
+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
@@ -25,18 +38,20 @@ firewall --disabled
 
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
+network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-part / --size 3000 --fstype ext4
+part / --size 3000 --fstype ext4 --grow
 
 %include fedora-repo.ks
 
 reboot
 
 # Package list.
+# FIXME: instLangs does not work, so there's a hack below
+# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
 %packages --instLangs=en
 
 kernel-core
@@ -100,24 +115,37 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
-
 # this is installed by default but we don't need it in virt
-echo "Removing linux-firmware package."
-yum -C -y remove linux-firmware
+# Commenting out the following for #1234504
+#echo "Removing linux-firmware package."
+#dnf -C -y erase linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
 echo "Removing firewalld."
-yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+# FIXME! clean_requirements_on_remove is the default with DNF, but may
+# not work when package was installed by Anaconda instead of command line.
+# Also -- check if this is still even needed with new anaconda -- disabled
+# firewall should _not_ pull in this package.
+# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+dnf -C -y erase "firewalld*"
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+dnf -C -y erase authconfig
+
+# instlang hack. (Note! See bug referenced above package list)
+find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
+localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
+# this will kill a live system (since it's memory mapped) but should be safe offline
+mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+build-locale-archive
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -128,9 +156,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
@@ -176,10 +206,11 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/random-seed
 
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
+echo "Cleaning old dnf repodata."
+# FIXME: clear history?
+dnf clean all
+truncate -c -s 0 /var/log/dnf.log
+truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -194,10 +225,18 @@ 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
-mkdir -p /var/cache/yum
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys

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
@@ -107,11 +107,6 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
-
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
 yum -C -y remove linux-firmware
@@ -200,6 +195,13 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
 
 echo "Fixing SELinux contexts."
 touch /var/log/cron

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
@@ -98,11 +98,6 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-# If you want to remove rsyslog and just use journald, remove this!
-echo -n "Disabling persistent journal"
-rmdir /var/log/journal/ 
-echo . 
-
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
 yum -C -y remove linux-firmware
@@ -192,6 +187,14 @@ 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
+
+
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log

fedora-desktop-packages.ks

@@ -1,24 +0,0 @@
-%packages
-@firefox
-@gnome-desktop
-@libreoffice
-@networkmanager-submodules
-
-# FIXME; apparently the glibc maintainers dislike this, but it got put into the
-# desktop image at some point.  We won't touch this one for now.
-nss-mdns
-
-# This one needs to be kicked out of @standard
--smartmontools
-
-# We use gnome-control-center's printer and input sources panels instead
--system-config-printer
--im-chooser
-
-# Similarly, there was also some debate about removing rsyslog from @standard
-# (since much of its functionality is provided by journald now), but it's
-# not going to happen for f20 either, so drop it here for now.
-# https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
--rsyslog
-
-%end

fedora-docker-base.ks

@@ -2,24 +2,39 @@
 #
 # 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
-timezone America/New_York --isUtc --nontp
-rootpw --plaintext qweqwe
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+user --name=none
 
 keyboard us
-firewall --disable
 zerombr
 clearpart --all
 part / --size 3000 --fstype ext4
+network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
 %packages --excludedocs --instLangs=en --nocore
 bash
 fedora-release
+rootfiles
 vim-minimal
-yum
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
 -kernel
 
@@ -30,6 +45,9 @@ 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
 
@@ -43,7 +61,20 @@ basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 rm -f /usr/lib/locale/locale-archive
+
+#Setup locale properly
+localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
+
 rm -rf /var/cache/yum/*
 rm -f /tmp/ks-script*
 
+#Make it easier for systemd to run in Docker container
+cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
+sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
+
+#Mask mount units and getty service so that we don't get login prompt
+systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
+
+rm -f /etc/machine-id
+
 %end

fedora-install-cloud.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+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
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#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)
@@ -56,6 +56,9 @@ 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

fedora-install-server.ks

@@ -16,18 +16,22 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+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
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#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
@@ -68,13 +72,6 @@ dracut-*
 @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
@@ -84,6 +81,7 @@ dracut-*
 @headless-management
 @container-management
 @domain-client
+@server-hardware-support
 
 # Common server packages
 @mysql
@@ -123,6 +121,7 @@ dracut-*
 
 # Things needed for installation
 @anaconda-tools
+fedora-productimg-server
 
 # Langpacks
 autocorr-*

fedora-install-workstation.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+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
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#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
 
@@ -44,5 +44,8 @@ kernel*
 
 # Things needed for installation
 @anaconda-tools
+-fedora-productimg-cloud
+-fedora-productimg-server
+fedora-productimg-workstation
 
 %end

fedora-kde-packages.ks

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

fedora-live-astronomy_kde.ks

@@ -0,0 +1,164 @@
+#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,11 +10,11 @@
 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
+part / --size 4096 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
 %include fedora-repo.ks
@@ -47,6 +47,9 @@ 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
@@ -193,6 +196,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
 
@@ -298,6 +304,15 @@ rm -f /core*
 # convince readahead not to collect
 # FIXME: for systemd
 
+# forcibly regenerate fontconfig cache (so long as this live image has
+# fontconfig) - see #1169979
+if [ -x /usr/bin/fc-cache ] ; then
+   fc-cache -f
+fi
+
+echo 'File created by kickstart. See systemd-update-done.service(8).' \
+    | tee /etc/.updated >/var/.updated
+
 %end
 
 

fedora-live-cinnamon.ks

@@ -0,0 +1,55 @@
+# 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
+
+# exclude GNOME-specific menu items
+desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/fedora-release-notes.webapp.desktop
+desktop-file-edit --set-key=NoDisplay --set-value=true /usr/share/applications/yelp.desktop
+
+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

@@ -1,5 +1,5 @@
 # fedora-design-suite.ks
-# Based on Live Desktop
+# Based on Live Workstation
 # Description:
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
@@ -7,18 +7,18 @@
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
-%include fedora-live-desktop.ks
+%include fedora-live-workstation.ks
 
 #DVD size partition
 part / --size 8192
 
 %packages
-
 # graphics
 blender
+LuxRender-blender
+YafaRay-blender
 bluefish 
-#cinepaint
-cmyktool
+colord-extra-profiles
 darktable
 dia
 entangle
@@ -35,26 +35,33 @@ gimp-normalmap
 gimp-resynthesizer
 gimp-separate+
 gpick
-gmic-gimp 
+GraphicsMagick
+gmic-gimp
 hugin 
-mypaint
+ImageMagick
 inkscape
+inkscape-sozi
+inkscape-table
+mypaint
 nautilus-image-converter
 optipng
 phatch
 screenruler
 simple-scan
 scribus
-colord-extra-profiles 
+shutter
 synfigstudio
 xournal
 
 # office
 vym
+pdfmod
 pdfshuffler  
 
 # internet
 filezilla
+sparkleshare
+sshpass
 
 # audio & video
 audacity
@@ -65,45 +72,23 @@ aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
 campivisivi-titillium-fonts
 lato-fonts
+open-sans-fonts
 overpass-fonts
 
-# removal of duplicated and unneeded applications
+# removal of unneeded applications
 -gnome-boxes
 -gthumb
 -eog
 -gnome-photos
 -rdesktop
 
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--minicom
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--telnet
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
 %end
 
 %post
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
-#Enable categories in Gnome Shell
-app-folder-categories=['Utilities', 'Games', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'wine-wine', 'Crossover', 'Crossover Games', 'Science', 'Education', 'Universal Access', 'Other']
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
 FOE
 
 # Add link to lists of tutorials
@@ -119,10 +104,34 @@ 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 http://fedoraproject.org/wiki/Design_Suite
+Type=Application
+Icon=applications-internet
+Categories=Documentation;
+FOE
+chmod a+x /usr/share/applications/fedora-design-suite.desktop
+
+# Add information about Fedora Design Team
+cat >> /usr/share/applications/fedora-design-team.desktop << FOE
+[Desktop Entry]
+Name=Design Team Info
+GenericName=About Design Team 
+Comment=Wiki page of Design Team
+Exec=xdg-open http://fedoraproject.org/wiki/Design
+Type=Application
+Icon=applications-internet
+Categories=Documentation;
+FOE
+chmod a+x /usr/share/applications/fedora-design-team.desktop
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
-#EOF
-
 %end
 

fedora-live-desktop.ks

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

fedora-live-games.ks

@@ -4,7 +4,7 @@
 # - 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
@@ -53,7 +53,7 @@ maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
 pinball
 scorched3d
@@ -171,7 +171,6 @@ celestia
 childsplay
 gcompris
 planets
-stellarium
 tuxpaint
 tuxpaint-stamps
 tuxtype2

fedora-live-jam_kde.ks

@@ -199,12 +199,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

@@ -13,16 +13,16 @@ 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
@@ -40,17 +40,22 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 
 # set up autologin for user liveuser
-sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
-
-# set up user liveuser as default user and preselected user
-sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
-sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
+if [ -f /etc/sddm.conf ]; then
+sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
+else
+cat > /etc/sddm.conf << SDDM_EOF
+[Autologin]
+User=liveuser
+Session=plasma.desktop
+SDDM_EOF
+fi
 
 # 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/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
@@ -75,23 +80,13 @@ 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/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
@@ -102,24 +97,10 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
-# Disable nepomuk
-cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
-[Basic Settings]
-Start Nepomuk=false
-
-[Service-nepomukfileindexer]
-autostart=false
-NEPOMUK_EOF
-
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 
-# small hack to enable plasma-netbook workspace on boot
-if strstr "\`cat /proc/cmdline\`" netbook ; then
-   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
-   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
-fi
 EOF
 
 %end

fedora-live-kde.ks

@@ -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 GiB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -12,54 +11,62 @@
 %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*
+-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-desktop but useful
+# Additional packages that are not default in kde-* groups, but useful
 k3b				# ~15 megs
-calligra
 #kdeartwork			# only include some parts of kdeartwork
-#twinkle			# (~10 megs)
 fuse
 liveusb-creator
-#pavucontrol			# pavucontrol has duplicate functionality with kmix
-krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
-# kdeedu apps
-blinken
-kalzium
-kanagram
-kgeography
-khangman
-kiten
-klettres
-ktouch
-kturtle
-kwordquiz
-parley
-step
-marble
-kstars
-kalgebra
-kbruch
-kig
-kmplot
-rocs
-cantor
+# 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-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
 

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
@@ -19,9 +58,6 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
-# temporarily fix for theme issue with anaconda rhbz (#1136994)
-sed -i "s/^gtk-theme='BlueMenta'/gtk-theme='Adwaita'/" /usr/share/glib-2.0/schemas/mate-fedora.gschema.override
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
@@ -43,4 +79,7 @@ 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-scientific_kde.ks

@@ -48,21 +48,26 @@ ddd
 valgrind
 
 #python 2 tools/libraries not included from the groups
+python-tools
 python-ipython
 python-ipython-console
 python-ipython-notebook
 sympy
 python-networkx
+python-pandas
 
 #python 3 and tools/libraries not included from the groups
 python3
+python3-tools
 python3-matplotlib
 python3-scipy
 python3-numpy
 python3-ipython
 python3-ipython-console
 python3-ipython-notebook
+python3-sympy
 python3-networkx
+python3-pandas
 
 # matplotlib backends
 python-matplotlib-qt4

fedora-live-security.ks

@@ -75,7 +75,6 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
--picviz-gui
 -proxychains
 -pyrit
 -raddump
@@ -88,9 +87,7 @@ gnome-keyring-pam
 -tcpreplay
 -tripwire
 -wipe
-
-# Is not available for OpenVAS-7. No longer supported by upstream.
--openvas-client 
+-zmap
 
 %end
 

fedora-live-soas.ks

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

fedora-live-workstation.ks

@@ -43,6 +43,11 @@ FOE
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
   fi
+
+  # Copy Anaconda branding in place
+  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
+    cp -a /usr/share/lorax/product/* /
+  fi
 fi
 
 # rebuild schema cache with any overrides we installed

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

fedora-livecd-kde.ks

@@ -1,83 +0,0 @@
-# fedora-livecd-kde.ks
-#
-# Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 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*
--scribus			# scribus is too big for the live images
--kdeartwork-screensavers	# screensavers are not needed on live images
-#-ktorrent			# kget has also basic torrent features (~3 megs)
--digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-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
-k3b				# ~15 megs
--calligra			# don't include whole calligra, just parts of it
-calligra-words
-calligra-sheets			# ~1 megs
-calligra-stage			# ~3 megs
-#kdeartwork			# only include some parts of kdeartwork
-#twinkle			# (~10 megs)
-fuse
-liveusb-creator
-
-# 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:
--nhn-nanum-gothic-fonts			# Korean (old name, still in comps)
--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,93 +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
-# First, no office
--planner
-
-# Drop things for size
--@3d-printing
--brasero
--bluez
--bluez-cups
--@dial-up
--dnf
--gnome-bluetooth-libs
--gnome-icon-theme-symbolic
--gnome-software
--gnome-user-docs
--@guest-desktop-agents
--@libreoffice
--@mate-applications
--mate-icon-theme-faenza
--transmission-gtk
-
-# Drop oversized fonts that aren't needed
--cjkuni-uming-fonts
--wqy-zenhei-fonts
-
-# Drop the Java plugin
--icedtea-web
--java-1.8.0-openjdk
-
-# Drop things that pull in perl
--linux-atm
-
-# No printing
--foomatic-db-ppds
--foomatic
-
-# Dictionaries are big
-# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
-# strong preference to giving it a go on #fedora-desktop.
-# also see http://bugzilla.gnome.org/681084
--aspell-*
--man-pages*
--words
-
-# Help and art can be big, too
--gnome-user-docs
--evolution-help
--desktop-backgrounds-basic
--*backgrounds-extras
-
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--nano
--minicom
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
-# Drop some system-config things
--system-config-language
--system-config-printer
--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-livecd-desktop.ks
-
-# DVD payload
-part / --size 10240
-
-%packages
-
-@electronic-lab
-
-# Support for the Milkymist hardware community
-@milkymist
-
-
-# Office
-dia
-vym
-libreoffice-writer
-libreoffice-calc
-libreoffice-impress
-#libreoffice-extendedPDF
-planner
-graphviz
-
-
-# debugging tools
-make
-gdb
-valgrind
-kdbg
-wireshark-gnome
-qemu
-
-
-# EDA/CAD department
-perl-Test-Pod
-perl-Test-Pod-Coverage
-
-
-# Removing unnecessary packages from the desktop spin
--abiword
--@games
--gimp
--gimp-libs
--gimp-data-extras
--kdebluetooth
--kbluetooth
--rdesktop
-
-%end
-
-%post
-
-%end

fedora-mate-packages.ks

@@ -1,8 +1,5 @@
 %packages
--realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
--ConsoleKit                 # ConsoleKit is deprecated
--ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
 @mate
 compiz
@@ -11,7 +8,6 @@ compiz-plugins-extra
 compiz-manager
 compizconfig-python
 compiz-plugins-unsupported
-compiz-bcop
 compiz-mate
 libcompizconfig
 compiz-plugins-main
@@ -20,13 +16,39 @@ emerald-themes
 emerald
 fusion-icon
 fusion-icon-gtk
-@libreoffice
 @networkmanager-submodules
+blueman
+
+# some apps from mate-applications
+caja-actions
+mate-disk-usage-analyzer
+mate-netspeed
+
+# more backgrounds
+f22-backgrounds-mate
+f21-backgrounds-extras-base
+f21-backgrounds-extras-mate
+
+# system tools
+system-config-printer
+system-config-printer-applet
+
+# audio video
+parole
+exaile
+PackageKit-gstreamer-plugin
+
+# blacklist applications which breaks mate-desktop
+-audacious
+
+# office
+@libreoffice
+
+# dsl tools
+rp-pppoe
 
 # 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,3 @@
-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

fedora-repo-rawhide.ks

@@ -1 +1 @@
-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

fedora-soas-packages.ks

@@ -8,7 +8,6 @@
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Mel Chua <mchua AT fedoraproject DOT org>
 
-
 %packages
 -@fonts
 -@dial-up
@@ -29,6 +28,18 @@
 -realmd
 -eekboard-libs
 -open-vm-tools*
+-gfs2-utils
+-abrt-cli
+-ibus*
+-hyperv-daemons
+
+# Add some extra fonts
+dejavu-sans-fonts
+dejavu-sans-mono-fonts
+madan-fonts
+aajohan-comfortaa-fonts
+sil-abyssinica-fonts
+vlgothic-fonts
 
 # == Core Sugar Platform ==
 @sugar-desktop

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

@@ -9,6 +9,7 @@
 # workstation-product-environment in comps
 @base-x
 @core
+@firefox
 @fonts
 @guest-desktop-agents
 @hardware-support
@@ -18,6 +19,9 @@
 @printing
 @workstation-product
 
+# Branding for the installer
+fedora-productimg-workstation
+
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils

fedora-xfce-packages.ks

@@ -21,6 +21,11 @@
 
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
+# Add some screensavers, people seem to like them
+# Note that blank is still default.
+xscreensaver-extras
+wget
+system-config-printer
 
 # save some space
 -autofs
@@ -30,32 +35,6 @@ gnome-keyring-pam
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
--gnumeric
--foomatic-db-ppds
--foomatic
--gutenprint
--stix-fonts
--ibus-typing-booster
 -xfce4-sensors-plugin
-#-man-pages-*
--adobe-source-han-* # save 94MB
--rodent-icon-theme  # save 34MB
--skkdic             # save 25MB
--naver-nanum-gothic-fonts # save 14MB
--ibus-kkc
--ibus-libpinyin
--libpinyin-data
--libkkc-data
-# Drop some fonts for space
--vlgothic-fonts
--paratype-pt-sans-fonts
--jomolhari-fonts
--sil-abyssinca-fonts
-
-# drop some system-config things
--system-config-network
--system-config-rootpassword
-#-system-config-services
--policycoreutils-gui
 
 %end

l10n/fedora-live-workstation-de_CH.ks

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

l10n/fedora-live-workstation-de_DE.ks

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

l10n/fedora-live-workstation-fr_FR.ks

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

l10n/fedora-live-workstation-nl_NL.ks

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

l10n/fedora-live-workstation-pt_BR.ks

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

l10n/fedora-live-workstation-pt_PT.ks

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

l10n/fedora-live-workstation-ru_RU.ks

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