Revert "kde: Enable folderview on kde live"

This reverts commit 16a5bf2a4d. It didn't work reliably, and we have a better solution, https://admin.fedoraproject.org/updates/FEDORA-2015-8453
kde: Enable folderview on kde live
2025-12-09 00:20:31 +08:00 · 2015-05-21 11:36:04 -05:00 · 2015-05-18 09:31:40 -05:00 · 2015-05-16 08:35:09 -04:00 · 2015-05-15 14:51:06 -07:00 · 2015-05-12 10:13:44 -07:00
92 changed files with 1459 additions and 1704 deletions
--- a/.sparkleshare
+++ b/.sparkleshare
@@ -0,0 +1 @@
+d6afc629dc9311ebd79b4cedb2775531065ecb05
--- a/2
+++ b/2
@@ -18,8 +18,6 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
-	mkdir -p -m 755 $(DATADIR)/$(name)/snippets
-	install -m 644 snippets/* $(DATADIR)/$(name)/snippets

 clean:
 	rm -f $(name)-*.tar.gz
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
+The master branch is where development takes place:
+ - it may contain kickstart files that are broken, or
+ - spin concepts that are in the process of being
+   approved by the Board (trademark approval), or
+ - spin concepts that are in the process of being
+   approved by the Spins SIG
+
+The release specific branches contain spin concepts that:
+ - are approved (both by Board and Spin SIG)
+ - maintained for the remainder of the release cycle
+
+git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
+cd spin-kickstarts
+# If you need a specific branch other than master:
+git checkout BRANCHNAME
+# No tag has been added yet tag HEAD with
+git tag VERSION
+git push --tags
+make
+# Publish the released tar ball
+make publish
+# Clean up the generated files:
+make clean
--- a/README.md
+++ b/README.md
@@ -1,31 +0,0 @@
-# fedora-kickstarts #
-
-This project is used to manage the Fedora kickstart files used in composing Fedora release images. 
-
-The master branch is used by rawhide and each release branch is used by that release. 
-
-All changes should be made via the PR workflow. 
-
-This project is packaged in Fedora as the spin-kickstarts package allowing users to see 
-and modify the kickstart files for their local needs. 
-
-## To make a release ##
-
- * git clone ssh://git@pagure.io/fedora-kickstarts.git fedora-kickstarts
- * cd fedora-kickstarts
- * # If you need a specific branch other than master:
- * git checkout BRANCHNAME
- * # No tag has been added yet tag HEAD with
- * git tag VERSION
- * git push --tags
- * make
- * # Publish the released tar ball
- * make publish
- * # Clean up the generated files:
- * make clean
-
-# bug reports #
-
-Bugs should be reported to the spin-kickstarts bugzilla component:
-
-https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts
--- a/SparkleShare.txt
+++ b/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! :)
--- a/atomic-installer/lorax-configure-repo.tmpl
+++ b/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 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\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"

--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -4,11 +4,12 @@
 lang C
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"
 network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network

 # Uncomment the next line
 # to make the root password be thincrust
@@ -94,9 +95,5 @@ generic-logos
 #
 %post

-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end

--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -1,21 +1,20 @@
 lang en_US.UTF-8
 #keyboard us
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh

 # configure extlinux bootloader
 bootloader extlinux

-part /boot/fw --size=30 --fstype vfat --asprimary
-part /boot --size=512 --fstype ext4 --asprimary
-part swap --size=512 --fstype swap --asprimary
-part / --size=2800 --fstype ext4 --asprimary
+part /boot --size=512 --fstype ext3
+part swap --size=512 --fstype swap
+part / --size=3000 --fstype ext4

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

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

 %include fedora-repo.ks

@@ -23,48 +22,30 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
@core
@standard
@hardware-support
+@dial-up

 kernel
-# remove this in %post
+
 dracut-config-generic
-dracut-config-rescue
-# install tools needed to manage and boot arm systems
-@arm-tools
-uboot-images-armv8
-rng-tools
+
 chrony
+arm-boot-config
 extlinux-bootloader
-bcm283x-firmware
 initial-setup
 initial-setup-gui
-iwl*
-ipw*
-trousers-lib
-usb_modeswitch
-iproute-tc
 #lets resize / on first boot
 # dracut-modules-growroot

-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
+# remove this in %post
+dracut-config-generic
+
+# install uboot images
+uboot-images-armv7

-# workaround for consequence of RHBZ #1324623: without this, with
-# yum-based creation tools, compose fails due to conflict between
-# libcrypt and libcrypt-nss. dnf does not seem to have the same
-# issue, so this may be dropped when appliance-creator is ported
-# to dnf.
-libcrypt-nss
-libcrypt
 %end

 %post

-# Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/fw/
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/fw/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
-sed -i '/vfat/ d' /etc/fstab
-
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -75,23 +56,14 @@ rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*

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

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

-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
+yum -y remove dracut-config-generic

 %end

--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -1,9 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks

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

 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .

 %end
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -1,7 +1,10 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-lxde-common.ks
+%include fedora-lxde-packages.ks

 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .

 %end
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@@ -1,14 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxqt-common.ks
-
-part / --size=3800 --fstype ext4 --asprimary
-
-%packages
-# trojita not available on non-x86 platforms
-trojita
-%end
-
-%post
-
-%end
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -1,9 +1,12 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-mate-common.ks
+%include fedora-mate-packages.ks

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

 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .

 %end
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,10 +1,27 @@
 %include fedora-arm-base.ks
-%include fedora-minimal-common.ks

-part /boot --size=512 --fstype ext4
+part /boot --size=300 --fstype ext3
 part swap --size=256 --fstype swap
-part / --size=1250 --fstype ext4
+part / --size=1200 --fstype ext4

 %packages
-xkeyboard-config
+-@standard
+-@dial-up
+-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
+
--- a/fedora-arm-python-classroom.ks
+++ b/fedora-arm-python-classroom.ks
@@ -1,8 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# The ARM Workstion based Python Classroom Lab
-
-%include fedora-arm-workstation.ks
-%include fedora-python-classroom-gnome-common.ks
--- a/fedora-arm-server.ks
+++ b/fedora-arm-server.ks
@@ -1,9 +1,10 @@
 %include fedora-arm-base.ks

 # server defaults to xfs for / so lets do so on arm also
-part / --size=2500 --fstype xfs
+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
@@ -22,5 +23,9 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .

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

--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -1,9 +1,10 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-soas-common.ks
-
-part / --size=3300 --fstype ext4 --asprimary
+%include fedora-soas-packages.ks

 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .

 %end
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -1,8 +1,8 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
+%include fedora-workstation-packages.ks

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

 %packages
 -initial-setup
@@ -10,8 +10,3 @@ part / --size=5500 --fstype ext4

 %end

-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
-
-%end
--- a/fedora-arm-xbase.ks
+++ b/fedora-arm-xbase.ks
@@ -6,11 +6,3 @@
@printing
 %end

-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
-
-# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
-%end
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -1,9 +1,11 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-xfce-common.ks
-
-part / --size=4000 --fstype ext4
+%include fedora-xfce-packages.ks
+part / --size=3500 --fstype ext4

 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .

 %end
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -1,27 +0,0 @@
-# fedora-cinnamon-common.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
-
-# mp3 support
-gstreamer1-plugins-ugly-free
-
-# extra backgrounds
-desktop-backgrounds-basic
-f26-backgrounds-extras-gnome
-
-%end
--- a/fedora-cloud-atomic-pxetolive.ks
+++ b/fedora-cloud-atomic-pxetolive.ks
@@ -14,7 +14,7 @@ network --bootproto=dhcp --device=link --activate
 part / --fstype="ext4" --size=6000
 part /boot --size=500 --fstype="ext4"
 shutdown
-services --disabled=docker-storage-setup
+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
@@ -28,9 +28,4 @@ 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
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 %end
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/fedora-cloud-atomic-vagrant.ks
@@ -1,16 +1,11 @@
-# Like the Atomic Host cloud image, but tuned for vagrant: enable the
-# vagrant user, disable cloud-init.
+# Like the Atomic cloud image, but tuned for vagrant.  Enable
+# the vagrant user, disable cloud-init.

-%include fedora-atomic.ks
+%include fedora-cloud-atomic.ks
+
+services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final

 user --name=vagrant --password=vagrant
-rootpw vagrant
-
-# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
-# even on VirtualBox virt, we get a primary network device with "eth0" as the name
-# This simplifies things and allows a single disk image for both supported Vagrant
-# platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"

 %post --erroronfail

@@ -18,13 +13,9 @@ bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,11520
 # to refactor to a common base.
 systemctl mask cloud-init cloud-init-local cloud-config cloud-final

-# The inherited cloud %post locks the passwd, but we want it
-# unlocked for vagrant, just like downstream.
-passwd -u root
-
 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+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
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -6,21 +6,23 @@
 # dedicated for Docker containers, and uses docker-storage-setup to
 # dynamically resize storage on boot.

-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC

-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
+user --name=none

 firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"

 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --disabled=network
+services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
@@ -31,28 +33,24 @@ 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=https://kojipkgs.fedoraproject.org/compose/atomic/26/ --ref=fedora/26/x86_64/atomic-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
-# we only need this for before f26 release where we are using a
-# temporary "dev" repo url above. We want to change the remote
-# we use to match where the repo will live for the entirety of f26.
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-26-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/26/'
+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
 passwd -l root
+# remove the user anaconda forces us to make
+userdel -r none

-# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
-cp /etc/skel/.bash* /var/roothome
-
-# 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
@@ -61,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*
@@ -109,7 +100,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Packages within this cloud image:"
 echo "-----------------------------------------------------------------------"
@@ -124,20 +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.)"

-# For trac ticket https://pagure.io/atomic-wg/issue/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Anaconda is writing an /etc/resolv.conf from the install environment.
-# The system should start out with an empty file, otherwise cloud-init
-# will try to use this information and may error:
-# https://bugs.launchpad.net/cloud-init/+bug/1670052
-truncate -s 0 /etc/resolv.conf
-
 %end
+
--- a/fedora-cloud-base-vagrant.ks
+++ b/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
@@ -42,7 +38,7 @@ 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=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+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
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -1,48 +1,36 @@
-# This is a basic Fedora cloud spin designed to work in OpenStack and other
+# This is a basic Fedora 21 spin designed to work in OpenStack and other
 # private cloud environments. It's configured with cloud-init so it will
 # take advantage of ec2-compatible metadata services for provisioning ssh
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
-# Note that unlike the standard Fedora install, this image has /tmp on disk
+# 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.

-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+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=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+part / --size 3000 --fstype ext4

 %include fedora-repo.ks

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

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

 # rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue

 # Some things from @core we can do without in a minimal install
 -biosdevname
-# Need to also add back plymouth in order to mask failure of
-# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
-#-plymouth
+-plymouth
 -NetworkManager
 -iprutils
-# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
-# systemd-vconsole-setup.service on boot. Comment out for now
-#-kbd
+-kbd
 -uboot-tools
 -kernel
-# No need for plymouth. Also means anaconda won't put rhgb/quiet
-# on kernel command line
-plymouth
+-grub2

 %end

@@ -117,6 +89,12 @@ ln -sf /boot/grub/grub.conf /etc/grub.conf
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
+# remove the user anaconda forces us to make
+userdel -r none
+
+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf

 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -125,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.
@@ -152,6 +128,9 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
 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"
@@ -211,7 +190,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old dnf repodata."
 # FIXME: clear history?
@@ -231,13 +210,22 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*

+
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
+
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-# ignore return code because UEFI systems with vfat filesystems
-# that don't support selinux will give us errors
-/usr/sbin/fixfiles -R -a restore || true
+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
@@ -245,22 +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
-
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-# Anaconda is writing an /etc/resolv.conf from the install environment.
-# The system should start out with an empty file, otherwise cloud-init
-# will try to use this information and may error:
-# https://bugs.launchpad.net/cloud-init/+bug/1670052
-truncate -s 0 /etc/resolv.conf
-
 %end

--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -16,17 +16,17 @@ 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=eth0 --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
@@ -97,6 +97,10 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -104,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.
@@ -174,7 +176,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old yum repodata."
 yum history new
@@ -205,7 +207,9 @@ echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
+chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
+chattr +i /boot/extlinux/ldlinux.sys

 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -213,9 +217,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.)"

-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end

--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -7,17 +7,17 @@ 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=eth0 --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

 zerombr
 clearpart --all
@@ -88,6 +88,10 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none

+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
@@ -95,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.
@@ -165,7 +167,7 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 #EOF

 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed

 echo "Cleaning old yum repodata."
 yum history new
@@ -207,9 +209,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.)"

-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
 %end

--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -1,94 +0,0 @@
-# fedora-disk-base.ks
-#
-# Defines the basics for all kickstarts in the fedora-live branch
-# Does not include package selection (other then mandatory)
-# Does not include localization packages or configuration
-#
-# Does includes "default" language configuration (kickstarts including
-# this template can override these settings)
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-firewall --enabled --service=mdns
-services --enabled=sshd,NetworkManager,chronyd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-zerombr
-clearpart --all --initlabel --disklabel=msdos
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-%include fedora-repo.ks
-
-%packages
-@core
-@standard
-@hardware-support
-
-kernel
-# remove this in %post
-dracut-config-generic
-dracut-config-rescue
-# install tools needed to manage and boot arm systems
-@arm-tools
-uboot-images-armv7
-rng-tools
-chrony
-bcm283x-firmware
-initial-setup
-iwl*
-ipw*
-trousers-lib
-usb_modeswitch
-iproute-tc
-generic-release*
-
-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
-
-# workaround for consequence of RHBZ #1324623: without this, with
-# yum-based creation tools, compose fails due to conflict between
-# libcrypt and libcrypt-nss. dnf does not seem to have the same
-# issue, so this may be dropped when appliance-creator is ported
-# to dnf.
-libcrypt-nss
-libcrypt
-%end
-
-%post
-
-# Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
-echo "Packages within this 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*
-
-# remove random seed, the newly installed instance should make it's own
-rm -f /var/lib/systemd/random-seed
-
-dnf -y remove dracut-config-generic
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@@ -1,10 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-minimal-common.ks
-
-services --enabled=sshd,NetworkManager,chronyd,initial-setup
-
-autopart --type=plain
-
-%packages
-xkeyboard-config
-%end
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@@ -1,27 +0,0 @@
-%include fedora-disk-base.ks
-
-services --enabled=sshd,NetworkManager,chronyd,initial-setup
-
-autopart
-
-%packages
-# install the default groups for the server evironment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@container-management
-@domain-client
-initial-setup-gui
-generic-release*
-%end
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -1,19 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-workstation-common.ks
-
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
-autopart --type=plain
-
-%packages
-initial-setup
-initial-setup-gui
-
-%end
-
-%post
-
-%end
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@@ -1,21 +0,0 @@
-%packages
-@base-x
-@fonts
-@input-methods
-@multimedia
-@printing
-@guest-desktop-agents
-
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
-aajohan-comfortaa-fonts
-
-# anaconda needs the locales available to run for different locales
-glibc-all-langpacks
-
-%end
-
-%post
-# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
-%end
--- a/fedora-docker-base-minimal.ks
+++ b/fedora-docker-base-minimal.ks
@@ -1,70 +0,0 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
-# This base is a stripped back Fedora image without python3/dnf.
-# If you need that use the standard base image.
-
-%include fedora-docker-common.ks
-
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-microdnf
-
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-# remove some random help txt files
-rm -fv usr/share/gnupg/help*.txt
-
-# Pruning random things
-rm usr/lib/rpm/rpm.daily
-rm -rfv usr/lib64/nss/unsupported-tools/  # unsupported
-
-# Statically linked crap
-rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
-ln usr/bin/ln usr/sbin/sln
-
-# Remove some dnf info
-rm -rfv /var/lib/dnf
-
-# don't need icons
-rm -rfv /usr/share/icons/*
-
-#some random not-that-useful binaries
-rm -fv /usr/bin/pinky
-
-# we lose presets by removing /usr/lib/systemd but we do not care
-rm -rfv /usr/lib/systemd
-
-# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
-rm -fv /etc/localtime
-mv /usr/share/zoneinfo/UTC /etc/localtime
-rm -rfv  /usr/share/zoneinfo
-
-# Final pruning
-rm -rfv /var/cache/* /var/log/* /tmp/*
-
-%end
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in docker
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-# NOTE: run this in nochroot because "umount" does not exist in chroot
-umount /mnt/sysimage/run
-# The file that specifies the /run/lock tmpfile is
-# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
-# rpm that isn't included in this image. We'll create the /run/lock
-# file here manually with the settings from legacy.conf
-# NOTE: chroot to run "install" because it is not in anaconda env
-chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
-
-
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
-# NOTE: run this in nochroot because "find" does not exist in chroot
-KEEPLANG=en_US
-for dir in locale i18n; do
-    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
-done
-
-%end
--- a/fedora-docker-base.ks
+++ b/fedora-docker-base.ks
@@ -1,39 +1,80 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
-# This base is a standard Fedora image with python3 and dnf
+# This is a minimal Fedora install designed to serve as a Docker base image. 
+#
+# To keep this image minimal it only installs English language. You need to change
+# yum configuration in order to enable other languages.
+#
+###  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file.  I store one here:
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
+# 
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+# 
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
+#

-%include fedora-docker-common.ks
+cmdline
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+user --name=none
+
+keyboard us
+zerombr
+clearpart --all
+part / --size 3000 --fstype ext4
+network --bootproto=dhcp --device=link --activate --onboot=on
+reboot

 %packages --excludedocs --instLangs=en --nocore
+bash
+fedora-release
 rootfiles
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 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
+

 %end

-%post --erroronfail --log=/root/anaconda-post.log
+%post --log=/tmp/anaconda-post.log
+# Set the language rpm nodocs transaction flag persistently in the
+# image yum.conf and rpm macros

-# remove some extraneous files
-rm -rf /var/cache/dnf/*
-rm -rf /tmp/*
+# remove the user anaconda forces us to make
+userdel -r none
+
+LANG="en_US"
+echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
+
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+rm -f /usr/lib/locale/locale-archive
+
+#Setup locale properly
+localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
+
+rm -rf /var/cache/yum/*
+rm -f /tmp/ks-script*
+
+#Make it easier for systemd to run in Docker container
+cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
+sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service

 #Mask mount units and getty service so that we don't get login prompt
 systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service

-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in docker
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-#
-# We ignore the return code of the systemd-tmpfiles command because
-# at this point we have already removed the /etc/machine-id and all
-# tmpfiles lines with %m in them will fail and cause a bad return
-# code. Example failure:
-#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
-#
-umount /run
-systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
+rm -f /etc/machine-id

 %end
--- a/fedora-docker-common.ks
+++ b/fedora-docker-common.ks
@@ -1,68 +0,0 @@
-# This is the common bits between Fedora Docker base image.
-#
-# To keep this image minimal it only installs English language. You need to change
-# dnf 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:
-#
-#   ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base-test.ks docker
-#
-
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-keyboard us
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-# boot partitions are irrelevant as the final docker image is a tarball
-zerombr
-clearpart --all
-autopart --noboot --nohome --noswap --nolvm
-
-%packages --excludedocs --instLangs=en --nocore
-fedora-release
-bash
-kernel
-dosfstools
-e2fsprogs
-fuse-libs
-gnupg2-smime
-libss # used by e2fsprogs
-libusbx
-pinentry
-shared-mime-info
-trousers
-xkeyboard-config
-
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-set -eux
-
-# Set install langs macro so that new rpms that get installed will
-# only install langs that we limit it to.
-LANG="en_US"
-echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
--- a/fedora-install-cloud.ks
+++ b/fedora-install-cloud.ks
@@ -0,0 +1,93 @@
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+# generic* would match generic-jms-ra, so don't 'simplify' this
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+# jruby used to be in this list, but springframework-context explicitly
+# requires it, not just 'any ruby implemention' - please check for things
+# on the image that require mvn(org.jruby:jruby) before adding jruby to
+# this list again - adamw 2014/09
+#-jruby
+
+# core
+kernel*
+dracut-*
+
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-cloud
+-fedora-productimg-server
+-fedora-productimg-workstation
+
+# Packages to enable server images to run in cloud environments
+@cloud-server
+@core
+@standard
+@headless-management
+@dogtag
+@directory-server
+@dns-server
+@freeipa-server
+@ftp-server
+@guest-agents
+@ha
+@load-balancer
+@mail-server
+@mysql
+@network-server
+@smb-server
+@sql-server
+@web-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+hyphen-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end
--- a/fedora-install-server.ks
+++ b/fedora-install-server.ks
@@ -0,0 +1,135 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+-fedora-productimg-cloud
+fedora-productimg-server
+-fedora-productimg-workstation
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+
+# core
+kernel*
+dracut-*
+
+# No desktops
+-cinnamon*
+-enlightenment*
+-gnome-shell
+-gnome-session
+-kde*
+-lightdm-kde
+-lightdm-razorqt
+# Pulls in qt
+-oprofile-gui
+
+-@legacy-fonts
+
+-@multimedia
+
+## common stuff
+@guest-agents
+@standard
+@core
+@hardware-support
+
+# Fedora Server.
+# Including this causes the fedora-release-server package to be included,
+# which in turn enables server-product-environment, and due to to its priority
+# this will be the default environment.
+@^server-product-environment
+@server-product
+@headless-management
+@container-management
+@domain-client
+@server-hardware-support
+
+# Common server packages
+@mysql
+@sql-server
+@web-server
+
+# Web Server environment
+@haproxy
+@mongodb
+@perl-web
+@python-web
+@php
+@rubyonrails
+@tomcat
+
+# Infrastructure Server
+@directory-server
+@dogtag
+@dns-server
+@freeipa-server
+@ftp-server
+@mail-server
+@network-server
+@printing
+@smb-server
+@virtualization
+@load-balancer
+@ha
+
+@javaenterprise
+
+# “uservisible” groups we want to offer
+@editors
+@network-server
+@system-tools
+@text-internet
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end
--- a/fedora-install-workstation.ks
+++ b/fedora-install-workstation.ks
@@ -0,0 +1,51 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+%include fedora-workstation-packages.ks
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-astronomy-bookmarks
+-generic*
+
+# core
+kernel*
+
+# Things needed for installation
+@anaconda-tools
+-fedora-productimg-cloud
+-fedora-productimg-server
+fedora-productimg-workstation
+
+%end
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@@ -0,0 +1,25 @@
+%packages
+@kde-apps
+@kde-desktop
+@kde-media
+@kde-office
+@kde-telepathy
+@networkmanager-submodules
+
+### The KDE-Desktop
+
+### fixes
+
+# use kde-print-manager instead of system-config-printer
+-system-config-printer
+# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
+mariadb-embedded
+mariadb-libs
+mariadb-server
+
+# minimal localization support - allows installing the kde-l10n-* packages
+system-config-language
+kde-l10n
+
+%end
+
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -1,136 +0,0 @@
-#fedora-live-astronomy-kde.ks
-# With KDE Desktop
-
-# Fedora Astronomy: For astronomers and astrophysicists
-# Fedora-Astronomy aims to create a Fedora which has the generic
-# toolset for the astronomer
-#
-# Web: https://fedoraproject.org/wiki/SIGs/Astronomy/AstroSpin
-#
-# Partly based on Scientific KDE Spin 
-#     https://fedoraproject.org/wiki/Scientific_Spin
-#
-
-# Maintainer: Christian Dersch <lupinix@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Lupinix
-
-%include fedora-live-kde.ks
-
-# The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 14500
-
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# astronomical data analysis
-cdsclient
-fpack
-gcx
-psfex
-saoimage
-scamp
-sextractor
-siril
-skyviewer
-swarp
-wcstools
-
-# Observatory: KStars + INDI drivers + Skychart
-indi-aagcloudwatcher
-indi-apogee
-indi-eqmod
-indi-gphoto
-indi-sx
-indistarter
-kstars
-stellarium
-
-# misc. astronomy
-celestia
-virtualplanet
-
-# Some astro environment stuff
-astronomy-menus
-astronomy-menus-toplevel
-
-#python 3 and tools/libraries not included from the groups
-python3
-python3-tools
-python3-matplotlib
-python3-scipy
-python3-numpy
-python3-ipython
-python3-ipython-console
-python3-ipython-notebook
-python3-sympy
-python3-networkx
-python3-pandas
-python3-pillow
-python3-seaborn
-python3-statsmodels
-python3-scikit-learn
-python3-scikit-image
-# Python 3 astronomy
-astropy-tools
-ginga
-python3-astropy
-python3-astroML
-python3-astroML-addons
-python3-astroquery
-python3-astroscrappy
-python3-APLpy
-python3-ATpy
-python3-ccdproc
-python3-fitsio
-python3-gatspy
-python3-photutils
-python3-pyvo
-python3-reproject
-python3-sep
-python3-wcsaxes
-
-# matplotlib backends
-python3-matplotlib-qt4
-python3-matplotlib-qt5
-python3-matplotlib-tk
-
-
-# Python IDE very useful for scientific use
-python3-spyder
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-gimp
-kst
-kst-docs
-kst-fits
-LabPlot
-
-#Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
-ImageMagick
-kate
-kate-plugins
-rlwrap
-screen
-plasma-applet-redshift-control
-
-# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
-kde-l10n-*
-calligra-l10n-*
-
-%end
-
-%post
-
-%end
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -10,17 +10,12 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-zerombr
-clearpart --all
-part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
+part / --size 4096 --fstype ext4
+services --enabled=NetworkManager --disabled=network,sshd

 %include fedora-repo.ks

@@ -39,8 +34,6 @@ shutdown
 # Explicitly specified here:
 # <notting> walters: because otherwise dependency loops cause yum issues.
 kernel
-kernel-modules
-kernel-modules-extra

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

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

 %post
@@ -73,7 +59,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
 # chkconfig: 345 00 99
 # description: Init script for live image.
 ### BEGIN INIT INFO
-# X-Start-Before: display-manager chronyd
+# X-Start-Before: display-manager
 ### END INIT INFO

 . /etc/init.d/functions
@@ -207,17 +193,12 @@ 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

 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
-# the hostname must be something else than 'localhost'
-# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-echo "localhost-live" > /etc/hostname
+echo "localhost" > /etc/hostname

 EOF

@@ -293,6 +274,7 @@ systemctl enable tmp.mount
 # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
 cat >> /etc/fstab << EOF
 vartmp   /var/tmp    tmpfs   defaults   0  0
+varcacheyum /var/cache/yum  tmpfs   mode=0755,context=system_u:object_r:rpm_var_cache_t:s0   0   0
 EOF

 # work around for poor key import UI in PackageKit
@@ -308,30 +290,23 @@ rm -f /var/lib/rpm/__db*
 # go ahead and pre-make the man -k cache (#455968)
 /usr/bin/mandb

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

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

+# forcibly regenerate fontconfig cache (so long as this live image has
+# fontconfig) - see #1169979
+if [ -x /usr/bin/fc-cache ] ; then
+   fc-cache -f
+fi
+
 echo 'File created by kickstart. See systemd-update-done.service(8).' \
    | tee /etc/.updated >/var/.updated

-# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
-# See bug 1317709
-rm -f /boot/*-rescue*
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 %end


@@ -343,5 +318,4 @@ if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
 fi
-
 %end
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -1,51 +0,0 @@
-# fedora-live-cinnamon.ks
-#
-# Description:
-# - Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-cinnamon-common.ks
-
-part / --size=6144
-
-%post
-# cinnamon configuration
-
-# create /etc/sysconfig/desktop (needed for installation)
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/cinnamon-session
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Cinnamon as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# and mark it as executable
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# this goes at the end after all other changes. 
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
-
-%end
-
-
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -1,61 +1,85 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
 # Description:
-# - A collection of applications targeted towards professional visual designers
+# - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainer:
+# Maintainers:
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Credit to Sebastian Dziallas for initiating the project
+# - Previous maintainer Sebastian Dziallas

 %include fedora-live-workstation.ks

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

 %packages
-# Switch to groups for design suite
-@design-suite
-
-# Added addons to address rhbz#1336879 from dnf
-gimp-data-extras
-gimp-dbp
-gimp-dds-plugin
+# graphics
+blender
+LuxRender-blender
+YafaRay-blender
+bluefish 
+colord-extra-profiles
+darktable
+dia
+entangle
+fontforge
+font-manager 
+gimp
 gimp-elsamuko
-gimp-fourier-plugin
+gimp-*-plugin
+gimp-data-extras
 gimp-gap
-gimp-help
-gimp-high-pass-filter
-gimp-layer-via-copy-cut
-gimp-lensfun
-gimp-lqr-plugin
-gimp-normalmap
 gimp-paint-studio
+gimp-high-pass-filter
+gimp-normalmap
 gimp-resynthesizer
-gimp-save-for-web
 gimp-separate+
-gimp-wavelet-denoise-plugin
-gimpfx-foundry
+gpick
+GraphicsMagick
 gmic-gimp
-inkscape-psd
+hugin 
+ImageMagick
+inkscape
 inkscape-sozi
 inkscape-table
-sane-backends-drivers-scanners
-xsane-gimp
-#YafaRay-blender
+mypaint
+nautilus-image-converter
+optipng
+phatch
+screenruler
+simple-scan
+scribus
+shutter
+synfigstudio
+xournal

-# Add extra gnome applications
-gnome-books
-gnome-calendar
-gnome-photos
+# office
+vym
+pdfmod
+pdfshuffler  

-# Extra wallpapers
-f26-backgrounds-extras-base
-f26-backgrounds-extras-gnome
+# internet
+filezilla
+sparkleshare
+sshpass

+# audio & video
+audacity
+pitivi
+
+# fonts
+aajohan-comfortaa-fonts
+adobe-source-sans-pro-fonts
+campivisivi-titillium-fonts
+lato-fonts
+open-sans-fonts
+overpass-fonts

 # removal of unneeded applications
 -gnome-boxes
+-gthumb
 -eog
+-gnome-photos
 -rdesktop

 %end
@@ -64,7 +88,7 @@ f26-backgrounds-extras-gnome
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+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
@@ -73,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;
@@ -86,7 +110,10 @@ 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 Suite
+GenericName=About Design Suite 
+Comment=Wiki page of Design Suite
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
@@ -98,8 +125,10 @@ cat >> /usr/share/applications/fedora-design-team.desktop << FOE
 [Desktop Entry]
 Name=Design Team Info
 GenericName=About Design Team 
+Name=About Design Team
+GenericName=About Design Team Wiki Page
 Comment=Wiki page of Design Team
-Exec=xdg-open https://fedoraproject.org/wiki/Design
+Exec=xdg-open http://fedoraproject.org/wiki/Design
 Type=Application
 Icon=applications-internet
 Categories=Documentation;
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -11,7 +11,7 @@
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>

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

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

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

 #recodring and DAW
 audacity
-ardour4
+ardour3
 rosegarden4
 seq24
 muse
@@ -108,6 +107,7 @@ ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
+lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins
@@ -167,6 +167,9 @@ rtirq
 japa
 radium-compressor

+#streaming
+idjc
+
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -3,10 +3,16 @@
 # mailto:kde@lists.fedoraproject.org

 %include fedora-live-base.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks

 %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/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
 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,9 +80,10 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF

-# Disable plasma-pk-updates (bz #1436873 and 1206760)
-echo "Removing plasma-pk-updates package."
-rpm -e plasma-pk-updates
+# 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/.config/baloofilerc << BALOO_EOF
@@ -71,12 +97,6 @@ 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/
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -1,7 +1,8 @@
-# fedora-livecd-kde.ks
+# fedora-live-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
+#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -11,7 +12,37 @@
 %include fedora-live-minimization.ks

 # DVD payload
-part / --size=6144
+part / --size=8192
+
+
+%packages
+# ship KDE wallpapers instead of GNOME ones
+-desktop-backgrounds-basic
+kde-wallpapers
+
+# 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)
+
+# kdeedu apps
+@kde-education
+
+# 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
+
+# KDE 4 translations
+kde-l10n-*
+calligra-l10n-*
+
+## avoid serious bugs by omitting broken stuff
+
+%end

 %post
 %end
--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@@ -1,51 +0,0 @@
-# fedora-live-lxqt.ks
-#
-# Description:
-# – Fedora Live Spin with the LXQt desktop environment
-#
-# Maintainer(s):
-# – Christian Dersch <lupinix@fedoraproject.org>
-#
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-lxqt-common.ks
-
-%post
-# add initscript
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up autologin for user liveuser
-if [ -f /etc/sddm.conf ]; then
-sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=lxqt.desktop/' /etc/sddm.conf
-else
-cat > /etc/sddm.conf << SDDM_EOF
-[Autologin]
-User=liveuser
-Session=lxqt.desktop
-SDDM_EOF
-fi
-
-# show liveinst.desktop on desktop and in menu
-sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
-
-# set up preferred apps 
-cat > /etc/xdg/libfm/pref-apps.conf << FOE 
-[Preferred Applications]
-WebBrowser=qupzilla.desktop
-FOE
-
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
-# make sure to set the right permissions and selinux contexts
-chown -R liveuser:liveuser /home/liveuser/
-restorecon -R /home/liveuser/
-
-EOF
-
-%end
-
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -1,13 +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-common.ks
-%include fedora-live-minimization.ks
+%include fedora-mate-packages.ks

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

 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -21,9 +19,6 @@ fi
 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
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@@ -7,6 +7,7 @@
 -mpage
 -sox
 -hplip
+-hpijs
 -numactl
 -isdn4k-utils
 -autofs
--- a/fedora-live-python-classroom.ks
+++ b/fedora-live-python-classroom.ks
@@ -1,9 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# The Workstion based Python Classroom Lab
-
-%include fedora-live-workstation.ks
-%include fedora-live-minimization.ks
-%include fedora-python-classroom-gnome-common.ks
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -1,50 +0,0 @@
-# fedora-livecd-soas.ks
-#
-# Description:
-# - A Sugar environment that you can carry in your pocket
-#
-# Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
-# - Mel Chua <mchua AT fedoraproject DOT org>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-soas-common.ks
-
-%post
-
-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 Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
-EOF
-
-cat >> /etc/rc.d/init.d/livesys-late << EOF
-
-# disable screensaver locking
-cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
-[org.gnome.desktop.screensaver]
-lock-enabled=false
-FOE
-
-# and hide the lock screen option
-cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
-[org.gnome.desktop.lockdown]
-disable-lock-screen=true
-FOE
-
-# rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-EOF
-
-chmod 755 /etc/rc.d/init.d/livesys-late
-/sbin/restorecon /etc/rc.d/init.d/livesys-late
-/sbin/chkconfig --add livesys-late
-
-%end
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -3,17 +3,15 @@
 # mailto:desktop@lists.fedoraproject.org

 %include fedora-live-base.ks
-%include fedora-workstation-common.ks
-#
-# Disable this for now as packagekit is causing compose failures
-# by leaving a gpg-agent around holding /dev/null open.
-#
-#include snippets/packagekit-cached-metadata.ks
+%include fedora-workstation-packages.ks

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

 %post

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


--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,34 +1,25 @@
+# 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
-@firefox
-@kde-apps
-@kde-desktop
-@kde-media
-@kde-office
-@kde-telepathy
-@networkmanager-submodules
-
-### The KDE-Desktop
-
-### Browser
-qupzilla
-
-### fixes
-
-# use kde-print-manager instead of system-config-printer
-system-config-printer
-# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
-mariadb-embedded
-mariadb-libs
-mariadb-server
-
-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
 # 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.)
@@ -40,7 +31,7 @@ kde-l10n
 k3b				# ~15 megs
 #kdeartwork			# only include some parts of kdeartwork
 fuse
-mediawriter
+liveusb-creator

 # only include kdegames-minimal
 -kdegames
@@ -53,7 +44,7 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 -naver-nanum-gothic-fonts		# Korean
 -vlgothic-fonts				# Japanese
 -adobe-source-han-sans-cn-fonts		# simplified Chinese
-adobe-source-han-sans-tw-fonts 	# traditional Chinese
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese

 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
@@ -65,6 +56,9 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 -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
@@ -77,3 +71,6 @@ wqy-microhei-fonts			# a compact CJK font, to replace:
 ## avoid serious bugs by omitting broken stuff

 %end
+
+%post
+%end
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@@ -8,7 +8,7 @@

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-lxde-common.ks
+%include fedora-lxde-packages.ks

 %post
 # LXDE and LXDM configuration
--- a/fedora-livecd-mate_compiz.ks
+++ b/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
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -6,9 +6,10 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
+#   Christoph Wickert <cwickert [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
-#   many thanks, especially to Christoph Wickert!
+#   many thanks!
 #   Fedora LXDE Spin - Copied over stuff to make LXDE Default
 #   Luke Macken and Adam Miller for the original OpenBox Security ks and all
 #   the Security Applications! 
@@ -93,6 +94,9 @@ gnome-keyring-pam
 %post
 # xfce configuration

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

 cat > /etc/sysconfig/desktop <<EOF
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -5,85 +5,15 @@
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
+
+%include fedora-live-base.ks
+%include fedora-live-minimization.ks
+%include fedora-soas-packages.ks

 firewall --enabled --service=mdns,presence

-%packages
-@fonts
-@dial-up
-@multimedia
-@printing
-foomatic
-@gnome-desktop 
-yp-tools
-ypbind
-rdate
-rdist
-icedtea-web
-firefox
-glx-utils
-nmap-ncat
-PackageKit
-eekboard-libs
-open-vm-tools*
-gfs2-utils
-abrt-cli
-ibus*
-hyperv-daemons
-webkitgtk4-plugin-process-gtk2
-webkitgtk3
-
-# 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
-sugar-ruler
-sugar-cp-updater
-lightdm
-lightdm-gtk
-
-# Write breaks unless we do this (we don't need it anyway)
-# enable for testing in the F17 dev cycle
-@input-methods
-
-# Needed for wifi, bluetooth and WWAN connection support
-@networkmanager-submodules
-
-# == Platform Components ==
-# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
-alsa-plugins-pulseaudio
-alsa-utils
-gstreamer1-plugins-base
-gstreamer1-plugins-good
-gstreamer1-plugins-bad-free
-gstreamer-plugins-espeak
-pulseaudio
-pulseaudio-utils
-
-# explicitly remove openbox and hopefully deal with what firstboot wants
-openbox
-
-# remove deps that come from god knows where
-sane-backends
-sane-backends-drivers-scanners
-
-# Usefulness for DSL connections as per:
-# http://bugs.sugarlabs.org/ticket/1951
-rp-pppoe
-
-# Get the Sugar boot screen
-plymouth-system-theme
-plymouth-theme-charge
-sugar-logos
-
-%end
-
 %post

 # Rebuild initrd for Sugar boot screen
@@ -121,7 +51,6 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
-org.laptop.Words
 org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
@@ -129,7 +58,6 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries
@@ -162,4 +90,37 @@ 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
+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 Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+EOF
+
+cat >> /etc/rc.d/init.d/livesys-late << EOF
+
+# disable screensaver locking
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+FOE
+
+# and hide the lock screen option
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+FOE
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late
+
 %end
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -11,11 +11,14 @@

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-xfce-common.ks
+%include fedora-xfce-packages.ks

 %post
 # xfce configuration

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

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

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

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

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

 %packages

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

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

@@ -35,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
@@ -51,29 +48,29 @@ gl-117
 glob2
 lincity-ng
 tmw
-#maniadrive - currently broken
-#maniadrive-music - has been retired
+maniadrive
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
 #neverball #cut for size
 nogravity
-#pinball # Would pull in fluid-soundfont-lite-patches
+pinball
 scorched3d
-# supertux # Crashing
+supertux
 #supertuxkart #remove for size
 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,19 +85,19 @@ hedgewars
 kcheckers
 knights
 lbrickbuster2
-# liquidwar # Would pull in fluid-soundfont-lite-patches
+liquidwar
 londonlaw
 lordsawar
-# lure scummvm games cut for size
-# machineball # Would pull in fluid-soundfont-lite-patches
+lure
+machineball
 nethack
 openlierox
 pachi
 pioneers
 quarry
-# Ri-li cut for size
+Ri-li
 rogue
-# scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
+scorchwentbonkers
 seahorse-adventures
 solarwolf
 sopwith
@@ -112,11 +109,11 @@ xblast

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

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

 # falling blocks games (small) 

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

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

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

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

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

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

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

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

 %packages

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

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

 #Devel tools

@@ -44,7 +48,7 @@ ddd
 valgrind

 #python 2 tools/libraries not included from the groups
-python2-tools
+python-tools
 python-ipython
 python-ipython-console
 python-ipython-notebook
@@ -84,10 +88,6 @@ rkward
 # GUI for Octave
 qtoctave

-# julia
-julia
-julia-doc
-
 # IDEs for the IDE folks
@eclipse
 spyder
@@ -110,9 +110,12 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
+pvm
+pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi
+python3-mpi4py-openmpi

 #Version control- a GUI for each as well

@@ -152,8 +155,8 @@ xzgv
 gimp
 ggobi
 ggobi-devel
-#g3data
-#Mayavi
+g3data
+Mayavi

 #Misc. Utils
 screen
@@ -168,8 +171,12 @@ 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

-%end
+%end
--- a/fedora-lxde-packages.ks
+++ b/fedora-lxde-packages.ks
@@ -43,6 +43,7 @@ metacity
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
+-realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -foomatic-db-ppds
 -foomatic
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -1,52 +0,0 @@
-# fedora-lxqt-common.ks
-#
-# Description:
-# – Fedora Live Spin with the LXQt desktop environment
-#
-# Maintainer(s):
-# – Christian Dersch <lupinix@fedoraproject.org>
-#
-
-%packages
-@lxqt
-@lxqt-apps
-@lxqt-media
-@networkmanager-submodules
-
-# for nm applet
-gnome-keyring
-
-
-# l10n
-lxqt-l10n
-lximage-qt-l10n
-obconf-qt-l10n
-pavucontrol-qt-l10n
-
-# MP3
-gstreamer1-plugin-mpg123
-
-# remove unneeded stuff to get a lightweight system
-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts          # a compact CJK font, to replace:
-naver-nanum-gothic-fonts       # Korean
-vlgothic-fonts             # Japanese
-adobe-source-han-sans-cn-fonts     # simplified Chinese
-adobe-source-han-sans-tw-fonts     # traditional Chinese
-
-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
-#-stix-fonts        # mathematical symbols
-
-# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
-
-# Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
-# Why is this not pulled in by anaconda???
-storaged
-
-%end
-
--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@@ -1,72 +0,0 @@
-%packages
-PackageKit*                # we switched to yumex, so we don't need this
-firefox
-@mate
-compiz
-compiz-plugins-main
-compiz-plugins-extra
-compiz-manager
-compizconfig-python
-compiz-plugins-experimental
-libcompizconfig
-compiz-plugins-main
-ccsm
-simple-ccsm
-emerald-themes
-emerald
-fusion-icon
-@networkmanager-submodules
-blueberry
-
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-
-# system tools
-system-config-printer
-system-config-printer-applet
-lightdm-gtk-greeter-settings
-
-# audio video
-parole
-exaile
-gstreamer1-plugins-ugly-free # mp3 support
-
-# blacklist applications which breaks mate-desktop
-audacious
-
-# office
-@libreoffice
-
-# dsl tools
-rp-pppoe
-
-# some tools
-p7zip
-p7zip-plugins
-
-# FIXME; apparently the glibc maintainers dislike this, but it got put into the
-# desktop image at some point.  We won't touch this one for now.
-nss-mdns
-
-# Drop things for size
-@3d-printing
-brasero
-colord
-fedora-icon-theme
-gnome-icon-theme
-gnome-icon-theme-symbolic
-gnome-software
-gnome-user-docs
-
-@mate-applications
-mate-icon-theme-faenza
-
-# Help and art can be big, too
-gnome-user-docs
-evolution-help
-
-# Legacy cmdline things we don't want
-telnet
-
-%end
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@@ -0,0 +1,30 @@
+%packages
+-PackageKit*                # we switched to yumex, so we don't need this
+-ConsoleKit                 # ConsoleKit is deprecated
+-ConsoleKit-x11             # ConsoleKit is deprecated
+firefox
+@mate
+compiz
+compiz-plugins-main
+compiz-plugins-extra
+compiz-manager
+compizconfig-python
+compiz-plugins-unsupported
+compiz-mate
+libcompizconfig
+compiz-plugins-main
+ccsm
+emerald-themes
+emerald
+fusion-icon
+fusion-icon-gtk
+@libreoffice
+@networkmanager-submodules
+
+# FIXME; apparently the glibc maintainers dislike this, but it got put into the
+# desktop image at some point.  We won't touch this one for now.
+nss-mdns
+
+# This one needs to be kicked out of @standard
+-smartmontools
+%end
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -1,19 +0,0 @@
-%packages
-@standard
-initial-setup-gui
-generic-release*
-glibc-all-langpacks
-glibc-langpack-en
-iw
-NetworkManager-wifi
-%end
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@@ -1,22 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# Common packages of all Python Classroom images
-
-%packages
-@python-classroom
-@python-science
-nano
-openssh-clients
-vim-enhanced
-wget
-
-# Remove Pythons possibly recommended by tox
-python26
-python33
-python34
-python35
-pypy
-
-%end
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -1,103 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# GNOME part of Python Classroom images
-
-%include fedora-python-classroom-common.ks
-
-%packages
-ninja-ide
-emacs
-python3-matplotlib-tk
-python3-pillow-tk
-
-# Remove extra gnome-y things
-@graphical-internet
-@games
-@sound-and-video
-@multimedia
-dleyna*
-evolution*
-gnome-boxes
-gnome-calendar
-gnome-clocks
-gnome-contacts
-gnome-disk-utility
-gnome-documents
-gnome-font-viewer
-gnome-maps
-gnome-weather
-grilo-plugins
-cheese
-totem
-totem-nautilus
-
-# This is no longer workstation
-@workstation-product
-fedora-productimg-workstation
-
-# Add a web browser
-@firefox
-
-# Remove office suite
-@libreoffice
-libreoffice-*
-planner
-
-# Drop the Java plugin and Java
-icedtea-web
-java*
-
-# No printing
-@printing
-foomatic-db-ppds
-foomatic
-
-# Dictionaries are big
-aspell-*
-words
-
-# Help and art can be big, too
-gnome-user-docs
-desktop-backgrounds-basic
-*backgrounds-extras
-
-# Legacy cmdline things we don't want
-krb5-auth-dialog
-krb5-workstation
-pam_krb5
-quota
-dos2unix
-finger
-ftp
-jwhois
-mtr
-pinfo
-rsh
-nfs-utils
-ypbind
-yp-tools
-rpcbind
-acpid
-ntsysv
-
-# Don't need this
-linux-atm
-
-# Drop some system-config things
-system-config-language
-system-config-network
-system-config-rootpassword
-system-config-services
-policycoreutils-gui
-
-%end
-
-
-%post
-
-#Override the favorite desktop application in Dash
-sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
-
-%end
--- a/fedora-python-classroom-vagrant.ks
+++ b/fedora-python-classroom-vagrant.ks
@@ -1,8 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# Like the Python Classroom image, but tuned for vagrant.
-
-%include fedora-cloud-base-vagrant.ks
-%include fedora-python-classroom-common.ks
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,4 +1,3 @@
-repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$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
--- a/fedora-repo-rawhide.ks
+++ b/fedora-repo-rawhide.ks
@@ -1,2 +1 @@
-repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -0,0 +1,88 @@
+# fedora-livecd-soas.ks
+#
+# Description:
+# - A Sugar environment that you can carry in your pocket
+#
+# Maintainers:
+# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
+
+%packages
+-@fonts
+-@dial-up
+-@multimedia
+-@printing
+-foomatic
+-@gnome-desktop 
+-yp-tools
+-ypbind
+-rdate
+-rdist
+-icedtea-web
+-firefox
+-glx-utils
+-nmap-ncat
+-PackageKit
+-libfprint
+-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
+-sugar-ruler
+sugar-cp-updater
+lightdm
+lightdm-gtk
+
+# Write breaks unless we do this (we don't need it anyway)
+# enable for testing in the F17 dev cycle
+@input-methods
+
+# Needed for wifi, bluetooth and WWAN connection support
+@networkmanager-submodules
+
+# == Platform Components ==
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
+alsa-plugins-pulseaudio
+alsa-utils
+gstreamer1-plugins-base
+gstreamer1-plugins-good
+gstreamer1-plugins-bad-free
+gstreamer-plugins-espeak
+pulseaudio
+pulseaudio-utils
+
+# explicitly remove openbox and hopefully deal with what firstboot wants
+-openbox
+
+# remove deps that come from god knows where
+-sane-backends
+-sane-backends-drivers-scanners
+
+# Usefulness for DSL connections as per:
+# http://bugs.sugarlabs.org/ticket/1951
+rp-pppoe
+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools
+
+# Get the Sugar boot screen
+-plymouth-system-theme
+-plymouth-theme-charge
+sugar-logos
+
+%end
--- a/fedora-virt-server.ks.in
+++ b/fedora-virt-server.ks.in
@@ -0,0 +1,72 @@
+# Kickstart file to create a small "base" Fedora image install suitable
+# for use as e.g. an application server.
+# 
+# Maintainer: fedora-cloud-list@fedoraproject.org
+#
+# REQUIRED variables:
+#   @@PUBLIC_KEY@@ - ssh public key
+# 
+# You must search for all required variables and replace them.
+# Example usage:
+# sed -e s,@@PUBLIC_KEY@@,"$(cat ~/.ssh/authorized_keys)", fedora-virt-server.ks.in > my-fedora-server.ks
+
+lang C
+keyboard us
+timezone --utc GMT/Zulu
+auth --useshadow --enablemd5
+firewall --service=ssh
+bootloader --timeout=1 --append="acpi=force"
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+
+## IMPORTANT ##
+## EDIT HERE ##
+# ROOT PASSWORD:
+# Setting a root password is NOT RECOMMENDED, especially if your
+# server will be accessible to the public internet.  This is
+# because of the rise of automated ssh password guessing attacks.
+# You should instead (if you don't have one already)
+# generate a public ssh key:
+# http://sial.org/howto/openssh/publickey-auth/
+# 
+# See comment below in %post for authorizing your public
+# key for the root account.
+
+rootpw ""
+
+# However, if you choose instead to make a password,
+# you will need to replace the above line with one like
+# rootpw --iscrypted @@ROOT_PASSWORD_CRYPTED@@
+# If you do neither of these things, you will not be able to log
+# into your machine.
+
+clearpart --all --initlabel
+part / --size=550 --grow --fstype=ext4
+# You may change this if you don't want swap
+part swap --recommended
+
+%packages
+@standard
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post
+
+## EDIT HERE ##
+cd /root
+if ! test -d .ssh; then
+  mkdir --mode=700 .ssh
+fi
+cat >> .ssh/authorized_keys << END_AUTHORIZED_KEYS
+@@PUBLIC_KEY@@
+END_AUTHORIZED_KEYS
+chmod 600 .ssh/authorized_keys
+if -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
+  chcon -R -h -t home_ssh_t .ssh
+fi
+
+%end
+
+reboot
--- a/fedora-workstation-packages.ks
+++ b/fedora-workstation-packages.ks
@@ -9,9 +9,7 @@
 # workstation-product-environment in comps
@base-x
@core
-@firefox
@fonts
-@gnome-desktop
@guest-desktop-agents
@hardware-support
@libreoffice
--- a/fedora-xfce-packages.ks
+++ b/fedora-xfce-packages.ks
@@ -21,16 +21,10 @@

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

 # save some space
@@ -38,6 +32,7 @@ system-config-printer
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
+-realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
--- a/l10n/fedora-livecd-cinnamon-de_DE.ks
+++ b/l10n/fedora-livecd-cinnamon-de_DE.ks
@@ -1,20 +0,0 @@
-# fedora-livecd-cinnamon-de_DE.ks
-#
-# Description:
-# - German Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Björn Esser <besser82@fedoraproject.org>
-
-%include ../fedora-live-cinnamon.ks
-
-lang de_DE.UTF-8
-keyboard de-latin1-nodeadkeys
-timezone Europe/Berlin
-
-%packages
-@german-support
-# exclude input methods
-m17n*
-scim*
-%end
--- a/l10n/fedora-livecd-cinnamon-ja_JP.ks
+++ b/l10n/fedora-livecd-cinnamon-ja_JP.ks
@@ -1,35 +0,0 @@
-# fedora-livecd-cinnamon-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-cinnamon.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
-m17n*
-scim*
-iok
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
--- a/l10n/fedora-livecd-lxde-ja_JP.ks
+++ b/l10n/fedora-livecd-lxde-ja_JP.ks
@@ -1,61 +0,0 @@
-# fedora-livecd-lxde-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the LXDE Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-lxde.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods:
-m17n*
-scim*
-ibus*
-iok
-# Better more popular browser
-firefox
-# ibus stuff
-ibus-kkc
-imsettings
-%end
-
-%post
-cat >> /etc/rc.d/init.d/livesys << EOF
-#### setting env and start ibus-deamon ####
-#mkdir /home/liveuser
-cat >> /home/liveuser/.bash_profile << FOE
-export XMODIFIERS="@im=ibus"
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=ibus
-ibus-daemon -drx
-FOE
-#### autostart ibus and stuff ####
-cat > /etc/xdg/autostart/imsettings-start.desktop << "FOE"
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Version=1.0
-Name=Input Method starter
-Name[ja]=入力メソッドのスターター
-Exec=imsettings-switch -n -q -x
-Terminal=false
-FOE
-EOF
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
--- a/l10n/fedora-livecd-xfce-ja_JP.ks
+++ b/l10n/fedora-livecd-xfce-ja_JP.ks
@@ -1,38 +0,0 @@
-# fedora-livecd-xfce-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the Xfce Desktop Environment
-#
-# Maintainer(s):
-# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
-
-%include ../fedora-live-xfce.ks
-
-lang ja_JP.UTF-8
-keyboard jp
-timezone Asia/Tokyo
-
-%packages
-@japanese-support
-# exclude input methods except ibus:
-m17n*
-scim*
-iok
-
-# ibus-kkc 
-ibus-kkc
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
--- a/snippets/autologin-gdm.ks
+++ b/snippets/autologin-gdm.ks
@@ -0,0 +1,12 @@
+# %post modifications for gdm
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+chown -R fedora:fedora /home/fedora
+sed -i -e 's/\[daemon\]/[daemon]\nTimedLoginEnable=true\nTimedLogin=fedora\nTimedLoginDelay=60/' /etc/gdm/custom.conf
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /home/fedora/.face
+    chown fedora:fedora /home/fedora/.face
+    # TODO: would be nice to get e-d-s to pick this one up too... but how?
+fi
+EOF
+
--- a/snippets/autologin-kdm.ks
+++ b/snippets/autologin-kdm.ks
@@ -0,0 +1,33 @@
+# %post modifications for kdm and kde
+
+# add initscript
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+
+if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
+    # use image also for kdm
+    mkdir -p /usr/share/apps/kdm/faces
+    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
+fi
+
+# make fedora user use KDE
+echo "startkde" > /home/fedora/.xsession
+chmod a+x /home/fedora/.xsession
+chown fedora:fedora /home/fedora/.xsession
+
+# set up autologin for user fedora
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=fedora/' /etc/kde/kdm/kdmrc
+
+# set up user fedora as default user and preselected user
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
+sed -i 's/#DefaultUser=johndoe/DefaultUser=fedora/' /etc/kde/kdm/kdmrc
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/fedora/.kde/share/config/
+cat > /home/fedora/.kde/share/config/kickoffrc << MENU_EOF
+[Favorites]
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
+MENU_EOF
+chown -R fedora:fedora /home/fedora/.kde/
+EOF
+
--- a/snippets/config-developer.ks
+++ b/snippets/config-developer.ks
@@ -0,0 +1,7 @@
+# %post modifications to add link to demonstration videos to desktop
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+pushd /home/fedora/Desktop
+ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
+popd
+EOF
--- a/snippets/config-electronic-lab.ks
+++ b/snippets/config-electronic-lab.ks
@@ -0,0 +1,57 @@
+# %post modifications specifically for Fedora Electronic Lab
+
+# Fedora Electronic Lab: Kwin buttons
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
+[Style]
+ButtonsOnLeft=MB
+ButtonsOnRight=FIAX
+CustomButtonPositions=true
+EOF
+
+# kill klipper
+cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
+[General]
+AutoStart=false
+EOF
+
+# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
+cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
+[Digital]
+LCD_Style=false
+Show_Date=false
+Show_Seconds=true
+
+[General]
+Type=Digital
+EOF
+
+cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
+[Layout]
+DisplayNames=
+EnableXkbOptions=false
+IncludeGroups=
+LayoutList=us,de,fr,jp
+Model=pc104
+Options=
+ResetOldOptions=false
+ShowFlag=true
+ShowSingle=true
+StickySwitching=false
+StickySwitchingDepth=2
+SwitchMode=Global
+Use=true
+EOF
+
+# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
+# This is a feature for Fedora and not for KDE
+cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
+cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
+
+/sbin/chkconfig anacron off
+/sbin/chkconfig sendmail off
+/sbin/chkconfig nfs off
+/sbin/chkconfig nfslock off
+/sbin/chkconfig rpcidmapd off
+/sbin/chkconfig rpcbind off
--- a/snippets/config-kde-gnome-keyring.ks
+++ b/snippets/config-kde-gnome-keyring.ks
@@ -0,0 +1,19 @@
+# %post modifications to set up gnome-keyring in KDE
+
+mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
+cat > /etc/skel/.kde/env/start-custom.sh << EOF
+#!/bin/sh
+eval \`gnome-keyring-daemon\`
+export GNOME_KEYRING_PID
+export GNOME_KEYRING_SOCKET
+EOF
+chmod 755 /etc/skel/.kde/env/start-custom.sh
+
+cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
+#/bin/sh
+if [-n "$GNOME_KEYRING_PID"]; then
+	kill $GNOME_KEYRING_PID
+fi
+EOF
+
+chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh
--- a/snippets/config-tracker.ks
+++ b/snippets/config-tracker.ks
@@ -0,0 +1,16 @@
+# %post modifications to configure tracker search
+
+mkdir -p /home/fedora/.config/tracker
+
+cat > /home/fedora/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
+
+mkdir -p /root/.config/tracker
+cat > /root/.config/tracker/tracker.cfg <<EOF
+[Indexing]
+EnableIndexing=false
+Language=en
+EOF
--- a/snippets/eeepc900-modifications.ks
+++ b/snippets/eeepc900-modifications.ks
@@ -0,0 +1,164 @@
+###### Eee PC 900 stuff ####################################################
+#
+###### Hotkeys #############################################################
+cat > /etc/acpi/actions/hotkeys.sh << EOHOTKEY
+#!/bin/bash
+
+export DISPLAY=:0
+
+case "$3" in
+
+    #Fn+F2
+    00000010)
+        # Wlan On
+        /etc/acpi/actions/wlan.sh poweron
+        ;;
+    00000011)
+        # Wlan Off
+        /etc/acpi/actions/wlan.sh poweroff
+        ;;
+
+    #Fn+F6
+    00000012)
+        # Webcam switch
+        /etc/acpi/actions/camera.sh
+        # TaskManager
+	# /usr/bin/gnome-system-monitor
+	;;
+
+    #Fn+F7
+    00000013)
+        # Volume mute
+	/usr/bin/amixer set -D hw:0 Master toggle
+	;;
+
+    #Fn+F8
+    00000014)
+        # Volume down
+        /usr/bin/amixer set -D hw:0 Master 10%- unmute
+        ;;
+
+    #Fn+F9
+    00000015)
+        # Volume up
+        /usr/bin/amixer set -D hw:0 Master 10%+ unmute
+        ;;
+
+    #Fn+F5
+    00000030)
+
+	/usr/bin/xrandr --output VGA  --mode 1024x768 \
+			--output LVDS --off
+
+	if [[ "$?" != "0" ]]; then
+
+	/usr/bin/xrandr --output VGA  --preferred \
+			--output LVDS --off
+
+	fi
+	;;
+
+    00000031)
+
+	/usr/bin/xrandr --output LVDS --mode 800x480 \
+		        --output VGA  --mode 800x600
+
+        ;;
+    
+    00000032)
+
+	/usr/bin/xrandr --output VGA  --off       \
+           		--output LVDS --preferred
+
+        ;;
+    *)
+        logger "ACPI hotkey $3 action is not defined"
+        ;;
+esac
+EOHOTKEY
+
+###### WLAN #############################################################
+cat > /etc/acpi/actions/wlan.sh << EOF
+#!/bin/bash
+
+PWR=$(cat /sys/devices/platform/eeepc/wlan)
+
+UnloadModules() {
+    rmmod ath_pci
+    rmmod ath_rate_sample
+    rmmod wlan_scan_sta
+    rmmod wlan_tkip
+    rmmod wlan_wep
+    rmmod wlan
+}
+
+LoadModules() {
+    modprobe ath_pci
+}
+
+case $1 in
+    poweron)
+        if [[ "$PWR" = "0" ]]; then
+            modprobe pciehp pciehp_force=1
+
+	    echo 1 > /sys/devices/platform/eeepc/wlan
+
+	    rmmod pciehp
+
+        fi
+        ;;
+           
+    poweroff)
+        if [[ "$PWR" = "1" ]]; then
+
+            modprobe pciehp pciehp_force=1
+
+            ifconfig ath0 down
+
+            wlanconfig ath0 destroy
+
+            UnloadModules
+
+            echo 0 > /sys/devices/platform/eeepc/wlan
+
+            rmmod pciehp
+
+        fi
+        ;;
+esac
+EOF
+
+###### Webcam #############################################################
+cat > /etc/acpi/actions/camera.sh << EOF
+
+#!/bin/bash
+
+CAMERA=$(cat /sys/devices/platform/eeepc/camera)
+
+        if [[ "$CAMERA" = "0" ]]; then
+   	    echo 1 > /sys/devices/platform/eeepc/camera
+         else
+            echo 0 > /sys/devices/platform/eeepc/camera
+        fi
+EOF
+
+chmod +x "/etc/acpi/actions/*"
+
+###### Shutdown fix #########################################################
+echo "modprobe -r snd-hda-intel" >> /sbin/halt.local
+chmod 755 /sbin/halt.local
+
+###### Gnome display stuff ##################################################
+
+gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8"
+gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8"
+gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8"
+gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "<Alt>F11"
+gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons"
+gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]"
+gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0
+gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0
+gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19
+gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19
--- a/snippets/packagekit-cached-metadata.ks
+++ b/snippets/packagekit-cached-metadata.ks
@@ -1,53 +0,0 @@
-# %post script to include initial metadata for PackageKit
-
-%post --nochroot
-# Copy over files needed for networking inside the chroot
-for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && cp $f /mnt/sysimage/$f.kickstart
-done
-%end
-
-%post
-
-# Use host machine's resolv.conf and hosts files
-for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && mv $f $f.orig
-  test -f $f.kickstart && mv -f $f.kickstart $f
-done
-
-PK_PREFIX=`mktemp -d`
-mkdir -p $PK_PREFIX/etc/yum.repos.d
-if [ -f /etc/yum.repos.d/fedora.repo ] ; then
-  cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
-  cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=https://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=https://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=https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
-fi
-rpm --root=$PK_PREFIX --initdb
-DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh
-if [ -d /var/cache/PackageKit ] ; then
-  mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/
-fi
-rm -rf $PK_PREFIX
-
-# Restore original resolv.conf and hosts files
-for f in /etc/resolv.conf /etc/hosts ; do
-  rm -f $f
-  test -f $f.orig && mv $f.orig $f
-done
-
-%end
--- a/snippets/repository-debuginfo.ks
+++ b/snippets/repository-debuginfo.ks
@@ -0,0 +1,25 @@
+# %post modifications to enable debuginfo repository
+
+awk '
+BEGIN {
+  debuginfo = 0
+}
+  /^\[.*\]/ {
+  if (/debuginfo/) {
+    debuginfo = 1
+  } else {
+    debuginfo = 0
+  }
+  print
+  next
+}
+  /enabled=0/ && debuginfo {
+  print "enabled=1"
+  next
+}
+{
+  print
+  next
+}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
+mv /etc/yum.repos.d/fedora.repo{.tmp,}
+
--- a/snippets/screensaver-gnome.ks
+++ b/snippets/screensaver-gnome.ks
@@ -0,0 +1,5 @@
+# %post modifications to disable GNOME screensaver locking
+
+cat >> /etc/rc.d/init.d/fedora-live << EOF
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
+EOF
--- a/snippets/screensaver-kde.ks
+++ b/snippets/screensaver-kde.ks
@@ -0,0 +1,3 @@
+# %post modifications to disable KDE screensaver
+
+sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
--- a/snippets/sysconfig-kde.ks
+++ b/snippets/sysconfig-kde.ks
@@ -0,0 +1,6 @@
+# %post modifications to create /etc/sysconfig/desktop for KDE
+
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
--- a/snippets/sysconfig-xfce.ks
+++ b/snippets/sysconfig-xfce.ks
@@ -0,0 +1,5 @@
+# %post modifications to create /etc/sysconfig/desktop for XFCE
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+EOF
Author	SHA1	Message	Date
Rex Dieter	c033c03c08	Revert "kde: Enable folderview on kde live" This reverts commit `16a5bf2a4d`. It didn't work reliably, and we have a better solution, https://admin.fedoraproject.org/updates/FEDORA-2015-8453	2015-05-21 11:36:04 -05:00
Rex Dieter	16a5bf2a4d	kde: Enable folderview on kde live workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1220862	2015-05-18 09:31:40 -05:00
Colin Walters	6ef2d02a30	docker: Use bootloader --none to work around Anaconda regression We were getting grub2 in the base image again. Apparently for a while Anaconda has supported a cleaner syntax for this, and since it fixes the bug, let's use it. https://bugzilla.redhat.com/show_bug.cgi?id=1222132	2015-05-16 08:35:09 -04:00
Luya Tshimbalanga	b8947535a2	design-suite: fixes correct name of page icons	2015-05-15 14:51:06 -07:00
Luya Tshimbalanga	72a583d4a4	design-suite: fixes documentation links only for f22	2015-05-12 10:13:44 -07:00
Colin Walters	7a6f83699b	docker: Don't use a hardcoded root password Best practice is to use unprivileged service daemons inside Docker containers. But with this hardcoded root password, in the case of remote code execution, an attacker could trivially escalate their privileges to root/uid 0. And while that's uid 0 inside a container, that's a much larger attack surface. Instead, do the same thing we're doing for the Cloud images: lock the root password, create a user to make Anaconda happy, then delete the user in %post. https://bugzilla.redhat.com/show_bug.cgi?id=1175997	2015-05-06 14:37:19 -04:00
Rex Dieter	76d2df7147	kde: drop plasma-netbook hack plasma-netbook no longer exists	2015-05-05 12:07:20 -05:00
Rex Dieter	1fd1f6d138	kde: Disable plasma-pk-updates on live image See also saga at: https://bugzilla.redhat.com/show_bug.cgi?id=1206760	2015-05-05 12:07:20 -05:00
Rex Dieter	94ab41ccd3	kde: drop apper references, fix baloofilerc	2015-05-05 12:07:20 -05:00
Rex Dieter	5f90422b0e	kde: fix browser link	2015-05-05 12:07:20 -05:00
Kalev Lember	c7094bf8ab	Drop any references to fedora-release-nonproduct The package is gone in F22+ and folded into fedora-release.	2015-04-24 22:27:31 +02:00
Peter Robinson	906bbfee12	Merge branch 'f22' of ssh://git.fedorahosted.org/git/spin-kickstarts into f22	2015-04-23 16:56:16 +01:00
Peter Robinson	a9325d0503	ARM: the /boot change was meant just to be for minimal	2015-04-23 16:55:56 +01:00
Colin Walters	0a2751d382	atomic-installer: Set the default origin Matching what we do in the cloud image, we also need to set the default URL for updates. Reported-by: Dennis Gilmore <dennis@ausil.us>	2015-04-23 11:46:37 -04:00
Luya Tshimbalanga	782967ccba	design-suite: fix design suite info	2015-04-21 18:26:00 -07:00
Dennis Gilmore	cd947e0c4a	remove the electronic_lab kickstart it has failed to compose the whole f22 cycle	2015-04-21 14:03:13 -05:00
Dennis Gilmore	e17d3d0ba4	Server installs in anaconda default to / on xfs so do so on arm also Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2015-04-21 08:39:22 -05:00
Peter Robinson	1c25cb6171	ARM minimal: adjust image size now X isn't being pulled in again	2015-04-18 18:37:18 +01:00
Ian McLeod	e171dabdc5	tested refinements to non-atomic vagrant	2015-04-01 22:15:39 -05:00
Stephen Gallagher	d7ef245b83	Fedora Server: re-add @hardware-support	2015-03-31 07:46:29 -04:00
Dan Horák	48296d16ae	update Server kickstart to match recent comps updates about hardware support	2015-03-30 18:07:34 +01:00
Kushal Das	b71f67490e	Adds DEVTIMEOUT option to /etc/sysconfig/network. #1204612 https://bugzilla.redhat.com/show_bug.cgi?id=1204612	2015-03-27 19:58:26 +05:30
raveit65	9308b5da94	Mate: bump size for livecd creation to 6MB	2015-03-27 13:16:59 +01:00
raveit65	500b85c343	Revert " drop nfs-utils temporarily to avoid slow boot" This reverts commit `2bd8c367cf`. nfs-utils-1.3.2-2.0.fc22 is in stable	2015-03-26 19:30:10 +01:00
Colin Walters	7f06442f8f	Revert "Revert "docker-base: Add dnf-yum" it is not yet acked by FESCo" Was now agreed http://meetbot.fedoraproject.org/fedora-meeting/2015-03-25/fesco.2015-03-25-18.00.log.html This reverts commit `9245751e67`.	2015-03-25 15:32:01 -04:00
Luya Tshimbalanga	02e041303b	design-suite: remove commented packages	2015-03-22 21:09:45 -07:00
Bruno Wolff III	5cb276a2f1	Games: Add back boswars boswars is building again and no longer has a library conflict. Hower this will put the games spin very close to 4 GiB and some more tweaking might be needed.	2015-03-22 22:21:47 -05:00
Colin Walters	7fcc4df93a	cloud-atomic: Drop old initscripts network bit Has never been needed with NM.	2015-03-20 14:08:15 -04:00
Colin Walters	cde583e3a2	cloud-atomic: use dhcp=internal for NetworkManager This uses systemd's DHCP library, and drops dhclient out of the picture, which saves RAM.	2015-03-20 14:08:15 -04:00
Dennis Gilmore	9245751e67	Revert "docker-base: Add dnf-yum" it is not yet acked by FESCo This reverts commit `cd820f7630`.	2015-03-19 20:06:57 -05:00
Colin Walters	5e9e250c1d	cloud-atomic: Disable network.service https://lists.fedoraproject.org/pipermail/cloud/2015-March/005131.html	2015-03-19 21:03:34 -04:00
Colin Walters	ba3bedacb3	cloud-atomic: Add a more explanatory comment header	2015-03-19 21:03:23 -04:00
Colin Walters	cd820f7630	docker-base: Add dnf-yum Per the FESCo ticket.	2015-03-19 18:12:16 -04:00
Colin Walters	fb6bcce1be	docker-base: Add some instructions for local builds	2015-03-19 18:12:13 -04:00
Colin Walters	d7d0e5ad95	atomic-installer: Update scripts These are now based on https://github.com/rhinstaller/lorax/pull/8	2015-03-19 18:11:54 -04:00
Brendan Jones	9fa38d0117	jam: change kde config location	2015-03-19 05:38:03 +01:00
Matthew Miller	cf9444b682	add fedora-cloud-base-vagrant.ks based on fedora-cloud-atomic-vagrant THIS IS JUST A STARTING POINT — untested!	2015-03-18 15:37:20 -04:00
Colin Walters	bfc2901422	lorax-embed-repo: Update to use HTTP-based location rpm-ostree-toolbox always uses this code path now; we spawn an "ostree trivial-httpd" even for local use. That way the same template can be used for both remote repositories and local ones.	2015-03-16 14:00:04 -05:00
Colin Walters	47ab710fe2	atomic-installer/: New subdirectory with Lorax template This is migrated from https://github.com/projectatomic/rpm-ostree-toolbox/blob/master/src/py/lorax-embed-repo.tmpl It is a command template to embed content into the installer.	2015-03-16 13:59:55 -05:00
Dennis Gilmore	0959478eab	Remove the firewall line as it causes anaconda to add firewalld to the package set. revert back to fedora-release	2015-03-16 13:59:47 -05:00
Dennis Gilmore	427657159d	pull in fedora-release-cloud to make the docker base image smaller during install dnf was pulling in fedora-release-server which added a lot of bloat	2015-03-11 16:15:10 -05:00
Rex Dieter	dbe507bd91	kde: nuke nepomuk references	2015-03-11 12:56:39 -05:00
Rex Dieter	0b6884a62e	kde: s/oxygen-gtk/Adwaita/	2015-03-11 12:55:10 -05:00
Rex Dieter	3677a24bd9	kde-base: fix kickstart favorites for plasma5	2015-03-11 08:39:48 -05:00
Brendan Jones	4675f6f6fd	jam: modify favourites location	2015-03-11 07:22:33 +01:00
raveit65	2bd8c367cf	drop nfs-utils temporarily to avoid slow boot	2015-03-09 16:23:42 +01:00
luya	a7d928767c	design-suite: fix correct url for both Design Suite and Design Team shorcuts	2015-03-09 02:39:43 -07:00
luya	f7d3da2878	design-suite: fix correct url for both Design Suite and Design Team shorcuts	2015-03-09 02:35:10 -07:00
luya	131565566b	design-suite: fix correct url for both Design Suite and Design Team shorcuts	2015-03-09 02:32:24 -07:00
raveit65	d4d001c549	Mate: add more packages	2015-03-08 15:13:15 +01:00
Dennis Gilmore	db8c33a53f	switch teh docker base image to dnf	2015-03-07 11:13:34 -06:00
Kevin Fenzi	16b8801b8e	Try this as a fix for ldconfig being so slow on boot on live media. bug 1195998	2015-03-07 07:00:31 -07:00
Colin Walters	264303aac1	atomic-vagrant: Mask cloud-init instead of using rm on /etc Now that cloud-init is enabled in the systemd unit, that change goes in /usr/lib...which we can't easily change. There are two potentially sane solutions: - Refactor the kickstarts here - Some support for systemd presets in kickstart files would allow us to have a later override here	2015-03-04 17:36:32 -05:00
Amit Saha	7c328c9965	Fedora Scientific: Remove the translation packages for now Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1197940	2015-03-04 12:01:25 +10:00
Adam Williamson	66b3b50b89	fedora-live-kde-base.ks: follow-up to autologin session fix There's two places where the session name is referenced, Kev only fixed one.	2015-03-02 18:22:30 -08:00
Colin Walters	341e2f56f9	atomic-pxetolive: Enable cloud-init Now that it's properly disabled by default in the package, we need to enable it here.	2015-03-01 13:33:37 -05:00
raveit65	b1c14531ce	Mate: add libreoffice suite + drop some removes	2015-03-01 03:49:03 +01:00
Luya Tshimbalanga	9c52c11e9a	design-suite: remove conflict text in ks	2015-02-27 20:15:15 -08:00
Luya Tshimbalanga	37dc4aa02f	design-suite: add design team and suite page minor revision	2015-02-27 20:12:44 -08:00
Luya Tshimbalanga	a8e9553e5c	design-suite: add design team and suite page shortcut	2015-02-27 20:10:36 -08:00
Kevin Kofler	75e15f1dd2	fedora-live-kde-base.ks: Change the autologin Session to plasma.desktop. Plasma 5 uses plasma.desktop instead of kde-plasma.desktop.	2015-02-26 20:07:56 +01:00
Colin Walters	9eed55b9e5	cloud-atomic-pxetolive: New file For the Atomic Host PXE-to-Live feature.	2015-02-25 22:22:03 -05:00
Dennis Gilmore	eae3708bca	add arm server image	2015-02-25 19:17:36 -06:00
Colin Walters	ee4bc19ae7	fedora-cloud-atomic-vagrant: New file for Changes/Vagrant_Box_Atomic See https://fedoraproject.org/wiki/Changes/Vagrant_Box_Atomic	2015-02-25 17:26:42 -05:00
Colin Walters	51d4c8ee45	atomic: Change the URLs to point to F22 content	2015-02-25 12:50:20 -05:00
luya	9defdef6cd	design-suite: fixed typo on open-sans-fonts	2015-02-25 03:33:02 -08:00
Stephen Gallagher	efab044d00	Fedora Server: Remove development packages Fedora Server is targeted at deployment environments. We'll save space on the DVD by skipping a lot of development tools.	2015-02-24 13:17:53 -05:00
Adam Williamson	13f09fe7d6	fix double ? in fedora-repo files	2015-02-20 09:12:36 -08:00
Fabian Affolter	38321a2d35	remove old packages	2015-02-20 14:43:53 +01:00
Dennis Gilmore	b5ab8fc9bb	disable rawhide on the workstation install tree	2015-02-19 10:54:19 -06:00
Dennis Gilmore	6881942927	enable the fedora repos and disable the rawhide ones	2015-02-19 08:25:54 -06:00
Bruno Wolff III	c00926fcb5	Games: Temporarily remove boswars, since it isn't building	2015-02-18 22:56:46 -06:00
Kevin Fenzi	66c69f4243	Add a few packages requested to xfce spin and increase base size	2015-02-18 19:17:01 -07:00
Peter Robinson	6633c8f661	XFCE: increase size of ARM image	2015-02-18 16:50:40 +00:00
Dennis Gilmore	84b8cd7926	enable the branched repos	2015-02-11 08:20:27 -06:00
Dennis Gilmore	f1cfec3f1b	choose more secure options for the repos	2015-02-11 08:19:33 -06:00