making cloud images is easier if we include the base

Revert "this breaks compose, need to revert"

This reverts commit d6a2350a39.

Makefile

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

README

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

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

atomic-installer/lorax-configure-repo.tmpl

@@ -1,8 +0,0 @@
-## Lorax template to configure Anaconda to use the local OSTree
-## repository on disk.
-
-<%page args="ostree_osname, ostree_ref"/>
-append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n"
-append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n"
-append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n"
-

atomic-installer/lorax-embed-repo.tmpl

@@ -1,11 +0,0 @@
-## Lorax template to embed an OSTree repository into the installer.iso
-## and configure an interactive installer use to look for it.
-##
-## Note that we pull with depth=0 to only get *one* commit into the
-## ISO, because we obviously don't want the full history.
-
-<%page args="workdir, ostree_osname, ostree_repo, ostree_ref"/>
-runcmd mkdir -p ${workdir}/iso-graft/content/repo
-runcmd ostree --repo=${workdir}/iso-graft/content/repo init --mode=archive-z2
-runcmd ostree --repo=${workdir}/iso-graft/content/repo remote add ostree-mirror --set=gpg-verify=false ${ostree_repo}
-runcmd ostree --repo=${workdir}/iso-graft/content/repo pull --mirror ostree-mirror ${ostree_ref}

custom/fedora-livedvd-haskell.ks

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

custom/qa-test-day.ks

@@ -3,7 +3,7 @@
 # Contact QA team if you have any improvements for this kickstart:
 # https://fedoraproject.org/wiki/QA
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 
 ## System configuration
@@ -136,7 +136,7 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
 rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
 
 PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
-cat << FOE >> $PREFDIR/00-test-day.js
+cat << FOE >> $PREFDIR/test-day.js
 pref("startup.homepage_welcome_url","");
 pref("startup.homepage_override_url","");
 pref("browser.rights.3.shown", true);

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
 

fedora-arm-base.ks

@@ -1,21 +1,16 @@
 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=3584 --fstype ext4 --asprimary
-
 # 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
 
@@ -26,68 +21,41 @@ services --enabled=sshd,NetworkManager,avahi-daemon,rsyslog,chronyd,initial-setu
 @dial-up
 
 kernel
-dracut-config-generic
-# install tools needed to manage and boot arm systems
-@arm-tools
-rng-tools
+kernel-lpae
+
 chrony
+arm-boot-config
 extlinux-bootloader
-bcm283x-firmware
 initial-setup
-initial-setup-gui
 #lets resize / on first boot
-# dracut-modules-growroot
+dracut-modules-growroot
 
 # remove this in %post
 dracut-config-generic
 
-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
+# install uboot images
+uboot-beagle
+uboot-beaglebone
+uboot-origen
+uboot-panda
+uboot-smdkv310
+uboot-uevm
+uboot-wandboard_dl
+uboot-wandboard_solo
+uboot-wandboard_quad
 
-# 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)
-basearch=armhfp
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-echo "Packages within this ARM disk image"
-rpm -qa
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# 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
 

fedora-arm-desktop-vfat.ks

@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-desktop-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%packages
+-initial-setup
+
+%end
+

fedora-arm-desktop.ks

@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-desktop-packages.ks
+%include fedora-arm-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%packages
+-initial-setup
+
+%end
+

fedora-arm-kde-vfat.ks

@@ -0,0 +1,13 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-kde-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end

fedora-arm-kde.ks

@@ -1,9 +1,13 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
+%include fedora-arm-partitioning.ks
 
-part / --size=5632 --fstype ext4
+part / --size=4000 --fstype ext4
 
 %post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
 
 %end

fedora-arm-lxde-vfat.ks

@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-lxde-packages.ks
+%include fedora-arm-vfat-partitioning.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

fedora-arm-lxde.ks

@@ -1,7 +1,11 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-lxde-packages.ks
+%include fedora-arm-partitioning.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

fedora-arm-mate-vfat.ks

@@ -0,0 +1,13 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-mate-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+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

fedora-arm-mate.ks

@@ -1,9 +1,13 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks
+%include fedora-arm-partitioning.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

fedora-arm-minimal-vfat.ks

@@ -0,0 +1,20 @@
+%include fedora-arm-base.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
+%end
+

fedora-arm-minimal.ks

@@ -1,18 +1,8 @@
 %include fedora-arm-base.ks
+%include fedora-arm-partitioning.ks
 
-part swap --size=256 --fstype swap
-part / --size=1279 --fstype ext4
-
-%packages
--@standard
--@dial-up
--initial-setup-gui
--generic-release*
--glibc-all-langpacks
-glibc-langpack-en
-iw
-NetworkManager-wifi
-%end
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
 
 %post
 
@@ -22,5 +12,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
 

fedora-arm-partitioning.ks

@@ -0,0 +1,4 @@
+part /boot --size=512 --fstype ext3
+part swap --size=512 --fstype swap
+part / --size=3000 --fstype ext4
+

fedora-arm-server.ks

@@ -1,27 +0,0 @@
-%include fedora-arm-base.ks
-
-# server defaults to xfs for / so lets do so on arm also
-part / --size=3000 --fstype xfs
-
-%packages
--@dial-up
-# install the default groups for the server evironment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@container-management
-@domain-client
--initial-setup-gui
--generic-release*
-%end
-
-%post
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-

fedora-arm-soas-vfat.ks

@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-soas-packages.ks
+%include fedora-arm-vfat-partitioning.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

fedora-arm-soas.ks

@@ -1,105 +1,11 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-soas-packages.ks
-
-firewall --enabled --service=mdns,presence
+%include fedora-arm-partitioning.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 .
 
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-# Get proper release naming in the control panel
-cat >> /boot/olpc_build << EOF
-Sugar on a Stick
-EOF
-cat /etc/fedora-release >> /boot/olpc_build
-
-# Add our activities to the favorites
-cat > /usr/share/sugar/data/activities.defaults << EOF
-org.laptop.WebActivity
-org.laptop.HelpActivity
-org.laptop.Chat
-org.laptop.sugar.ReadActivity
-org.laptop.sugar.GetBooksActivity
-org.laptop.AbiWordActivity
-org.laptop.TurtleArtActivity
-org.laptop.Calculate
-org.laptop.Clock
-org.laptop.ImageViewerActivity
-org.laptop.Memorize
-org.laptop.physics
-org.laptop.Pippy
-org.laptop.RecordActivity
-org.laptop.Oficina
-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
-org.sugarlabs.AbacusActivity
-org.sugarlabs.IRC
-org.sugarlabs.InfoSlicer
-org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
-org.sugarlabs.VisualMatchActivity
-com.garycmartin.Moon
-mulawa.Countries
-tv.alterna.Clock
-vu.lux.olpc.Maze
-vu.lux.olpc.Speak
-EOF
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/sugar
-DISPLAYMANAGER=/usr/sbin/lightdm
-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
-# set Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
-
-# Don't use the default system user (in SoaS liveuser) as nick name
-# Disable the logout menu item in Sugar
-# Enable Sugar power management
-cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
-[org.sugarlabs.user]
-default-nick='disabled'
-
-[org.sugarlabs]
-show-logout=false
-
-[org.sugarlabs.power]
-automatic=true
-EOF
-
-# 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
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
 %end

fedora-arm-vfat-partitioning.ks

@@ -0,0 +1,4 @@
+part /boot/uboot --size=20 --fstype vfat
+part swap --size=512 --fstype swap
+part / --size=3400 --fstype ext4
+

fedora-arm-workstation.ks

@@ -1,17 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-workstation-packages.ks
-
-part / --size=5500 --fstype ext4
-
-%packages
--initial-setup
--initial-setup-gui
-
-%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

fedora-arm-xbase.ks

@@ -7,10 +7,14 @@
 %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
+# X on arm does not detect the driver needed correctly so we need a snippet to set something
+# using fbdev as the lowest common denominator.
 
-# 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
+cat > /etc/X11/xorg.conf.d/fbdev.conf <<EOF
+Section "Device"
+    Identifier  "Display"
+    Driver      "fbdev"
+EndSection
+EOF
 
 %end

fedora-arm-xfce-vfat.ks

@@ -0,0 +1,11 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-xfce-packages.ks
+%include fedora-arm-vfat-partitioning.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

fedora-arm-xfce.ks

@@ -1,9 +1,11 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-
-part / --size=4000 --fstype ext4
+%include fedora-arm-partitioning.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

fedora-atomic-vagrant.ks

@@ -1,36 +0,0 @@
-# Like the Atomic cloud image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-atomic.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-user --name=vagrant --password=vagrant
-rootpw vagrant
-
-# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
-# even on VirtualBox virt, we get a primary network device with "eth0" as the name
-# This simplifies things and allows a single disk image for both supported Vagrant
-# platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
-
-
-%post --erroronfail
-
-# Work around cloud-init being both disabled and enabled; need
-# to refactor to a common base.
-systemctl mask cloud-init cloud-init-local cloud-config cloud-final
-
-# Vagrant setup
-sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
-sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
-mkdir -m 0700 -p ~vagrant/.ssh
-cat > ~vagrant/.ssh/authorized_keys << EOKEYS
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOKEYS
-chmod 600 ~vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant ~vagrant/.ssh/
-
-%end
-

fedora-atomic.ks

@@ -1,152 +0,0 @@
-# Fedora Atomic is a cloud-focused spin implementing the Project
-# Atomic patterns.  Note that this replicates the same tree which can
-# now be installed on bare metal.
-
-# This image allocates most space to an LVM-managed thin pool
-# dedicated for Docker containers, and uses docker-storage-setup to
-# dynamically resize storage on boot.
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
-
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-# Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="ext4"
-part pv.01 --grow
-volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
-
-# Equivalent of %include fedora-repo.ks
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/25/ --ref=fedora-atomic/25/x86_64/updates/docker-host
-
-reboot
-
-%post --erroronfail
-# Set the ref we are tracking to the be fedora-atomic/25/x86_64/docker-host
-# one, which is what we are using for the two week releases. We want consumers
-# of this image to track the two week releases
-ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/25/ fedora-atomic/25/x86_64/docker-host
-
-# Make sure the ref we're supposedly sitting on (according
-# to the updated origin) exists.
-ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --create fedora-atomic:fedora-atomic/25/x86_64/docker-host
-
-# Remove the old ref so that the commit eventually gets
-# cleaned up.
-ostree refs fedora-atomic:fedora-atomic/25/x86_64/updates/docker-host --delete
-
-# 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
-
-echo -n "Getty fixes"
-# although we want console output going to the serial console, we don't
-# actually have the opportunity to login there. FIX.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-# For trac ticket https://fedorahosted.org/cloud/ticket/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
-
-echo "Adding Developer Mode GRUB2 menu item."
-/usr/libexec/atomic-devmode/bootentry add
-
-# enable 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

fedora-cinnamon-packages.ks

@@ -1,32 +0,0 @@
-# fedora-cinnamon-packages.ks
-#
-# Description:
-# - Fedora package set for the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%packages
-
-@networkmanager-submodules
-@cinnamon-desktop
-@libreoffice
-
-# internet and multimedia
-pidgin
-hexchat
-transmission
-parole
-
-# make sure we have a graphical installer
-yumex-dnf
-
-# extra backgrounds
-desktop-backgrounds-basic
-f24-backgrounds-extras-gnome
-
-# save some space
--fedora-icon-theme
--PackageKit*                # we switched to yumex, so we don't need this
-
-%end

fedora-cloud-atomic-pxetolive.ks

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

fedora-cloud-base-arm.ks

@@ -1,12 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyAMA0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100
-
-%packages
-efibootmgr
-grub2-efi
-shim
-%end

fedora-cloud-base-ppc.ks

@@ -1,10 +0,0 @@
-%include fedora-cloud-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part prepboot --fstype="prepboot" --size=4
-part /boot --fstype="ext4" --size=500
-
-%packages
-grub2
-%end

fedora-cloud-base-vagrant.ks

@@ -1,61 +0,0 @@
-# Like the Cloud Base image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-cloud-base.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-# So, to be clear, this gaping security hole is an integral part of how
-# Vagrant works - These images are _not_ supposed to be run in any public-
-# Internet facing way - They are for use on developer setups, almost always
-# with NAT
-user --name=vagrant --password=vagrant
-
-# Suggestion from @purpleidea that most/many vagrant boxes also set root PW
-# to "vagrant" for ease of use.  Again, see comments above.
-rootpw vagrant
-
-# The addition of the net.ifnames=0 and biosdevnames=0 option ensures that
-# even on VirtualBox virt, we get a primary network device with "eth0" as the name
-# This simplifies things and allows a single disk image for both supported Vagrant
-# platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux
-
-%packages
-# The default koji Vagrantfile configuration uses rsync to sync files between
-# the vagrant host and the guest.  It uses yum to verify that rsync is present
-# and/or install it if it is not.  It will fail without adding the yum compat
-# layer for dnf
-# TODO: Teach vagrant about dnf
-dnf-yum
-# rsync gets installed when the Vagrant box is first launched on the
-# users setup. This can actually take a bit of time.  Just fold it
-# in to the base box disk image
-rsync
-%end
-
-%post --erroronfail
-
-# Work around cloud-init being both disabled and enabled; need
-# to refactor to a common base.
-systemctl mask cloud-init cloud-init-local cloud-config cloud-final
-
-# Vagrant setup
-sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
-sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
-mkdir -m 0700 -p ~vagrant/.ssh
-cat > ~vagrant/.ssh/authorized_keys << EOKEYS
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOKEYS
-chmod 600 ~vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant ~vagrant/.ssh/
-
-# Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
-mkdir -m 0700 -p /root/.ssh
-cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys
-chmod 600 /root/.ssh/authorized_keys
-chown -R root:root /root/.ssh
-
-%end
-

fedora-cloud-base.ks

@@ -1,4 +1,4 @@
-# This is a basic Fedora 21 spin designed to work in OpenStack and other
+# This is a basic Fedora 20 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
@@ -7,88 +7,76 @@
 # Note that unlike the standard F20 install, this image has /tmp on disk
 # rather than in tmpfs, since memory is usually at a premium.
 #
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To do a local build, you'll need to install ImageFactory.  See
-# http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
-#
-# For a TDL file, I store one here:
-# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
-# (Koji generates one internally...what we really want is Koji to publish it statically)
-# 
-# Once you have imagefactory and imagefactory-plugins installed, run:
-# 
-#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
-#   tempfile=$(mktemp --suffix=.ks)
-#   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
-#   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
-#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
 
-cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
-user --name=none
 
-firewall --disabled
+# this is actually not used, but a static firewall
+# matching these rules is generated below.
+firewall --service=ssh
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-#
-# We need to disable 64bit options here or extlinux won't work.
-# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
-# and
-# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
-#
-part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
+part / --size 2048 --fstype ext4
 
 %include fedora-repo.ks
 
+
 reboot
 
 # Package list.
-# FIXME: instLangs does not work, so there's a hack below
-# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-# 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
+@core
+grubby
 
-kernel-core
-@^cloud-server-environment
-# Need to pull in the udev subpackage
-systemd-udev
+# cloud-init does magical things with EC2 metadata, including provisioning
+# a user account with ssh keys.
+cloud-init
 
-# after move away from grub2 - let's add 'which' back
-which
+# this is used by openstack's cloud orchestration framework (and it's small)
+heat-cfntools
 
-# rescue mode generally isn't useful in the cloud context
+# need this for growpart, because parted doesn't yet support resizepart
+# https://bugzilla.redhat.com/show_bug.cgi?id=966993
+cloud-utils-growpart
+
+# We need this image to be portable; also, rescue mode isn't useful here.
+dracut-config-generic
 -dracut-config-rescue
 
+syslinux-extlinux 
+
+# Needed initially, but removed below.
+firewalld
+
+# Basic firewall. If you're going to rely on your cloud service's
+# security groups you can remove this.
+iptables-services
+
+# cherry-pick a few things from @standard
+tar
+rsync
+
 # 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
--uboot-tools
--kernel
--grub2
+-kbd
 
 %end
 
@@ -107,8 +95,8 @@ mkdir /boot/grub
 echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
 for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
   echo "title Fedora ($kv)" >> /boot/grub/grub.conf
-  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
+  echo -e "\troot (hd0)" >> /boot/grub/grub.conf
+  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
   echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
   echo
 done
@@ -122,8 +110,6 @@ 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.
@@ -135,38 +121,46 @@ rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
-# this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/ 
+echo . 
 
-# Remove firewalld; was supposed to be optional in F18+, but is pulled in
-# in install/image building.
+# this is installed by default but we don't need it in virt
+echo "Removing linux-firmware package."
+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.
 echo "Removing firewalld."
-# FIXME! clean_requirements_on_remove is the default with DNF, but may
-# not work when package was installed by Anaconda instead of command line.
-# Also -- check if this is still even needed with new anaconda -- disabled
-# firewall should _not_ pull in this package.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-dnf -C -y erase "firewalld*"
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+# Non-firewalld-firewall
+echo -n "Writing static firewall"
+cat <<EOF > /etc/sysconfig/iptables
+# Simple static firewall loaded by iptables.service. Replace
+# this with your own custom rules, run lokkit, or switch to 
+# shorewall or firewalld as your needs dictate.
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
+-A INPUT -j REJECT --reject-with icmp-host-prohibited
+-A FORWARD -j REJECT --reject-with icmp-host-prohibited
+COMMIT
+EOF
+echo .
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y erase authconfig
-
-# instlang hack. (Note! See bug referenced above package list)
-find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
-localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
-# this will kill a live system (since it's memory mapped) but should be safe offline
-mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
-awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -177,17 +171,15 @@ NAutoVTs=0' /etc/systemd/logind.conf
 
 echo -n "Network fixes"
 # initscripts don't like this file to be missing.
-# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
 cat > /etc/sysconfig/network << EOF
 NETWORKING=yes
 NOZEROCONF=yes
-DEVTIMEOUT=10
 EOF
 
 # For cloud images, 'eth0' _is_ the predictable device name, since
 # we don't want to be tied to specific virtual (!) hardware
 rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
 
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
@@ -195,7 +187,6 @@ DEVICE="eth0"
 BOOTPROTO="dhcp"
 ONBOOT="yes"
 TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
 EOF
 
 # generic localhost names
@@ -227,39 +218,13 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/random-seed
 
-echo "Cleaning old dnf repodata."
-# FIXME: clear history?
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
-truncate -c -s 0 /var/log/dnf.rpm.log
+echo "Cleaning old yum repodata."
+yum history new
+yum clean all
+truncate -c -s 0 /var/log/yum.log
 
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-# FIXME: is this still needed?
 echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
@@ -267,22 +232,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
 

fedora-cloud-bigdata.ks

@@ -1,227 +0,0 @@
-# This is a Fedora 21 spin designed based on the Fedora Cloud Base Image
-# but tailored specifically for Big Data processing out-of-the-box.
-# Primarily, it builds on that image but adds extra packages, but over
-# time may have additional focus.
-#
-# It's configured with cloud-init so it will take advantage of
-# ec2-compatible metadata services for provisioning ssh keys. Cloud-init
-# creates a user account named "fedora" with passwordless sudo access. The
-# root password is empty and locked by default.
-#
-# Note that unlike the standard F20 install, this image has /tmp on disk
-# rather than in tmpfs, since memory is usually at a premium.
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages
-
-fedora-release-cloud
-
-kernel-core
-@core
-@cloud-server
-
-# Needed initially, but removed below.
-firewalld
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--NetworkManager
--iprutils
--kbd
--uboot-tools
--kernel
--grub2
-
-%end
-
-
-
-%post --erroronfail
-
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
-  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
-  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
-  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
-  echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
-
-# Remove firewalld; was supposed to be optional in F18+, but is required to
-# be present for install/image building.
-echo "Removing firewalld."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
-
-echo -n "Getty fixes"
-# although we want console output going to the serial console, we don't
-# actually have the opportunity to login there. FIX.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
-
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
-echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
-%end
-

fedora-cloud-experimental.ks

@@ -1,219 +0,0 @@
-# This is a spin of the Fedora cloud image designed for trying out new
-# images in rawhide. It won't be built for non-rawhide trees, let alone
-# actual releases.
-
-cmdline
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --passalgo=sha512
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages --excludedocs --instLangs=en_US
-
-fedora-release-cloud
-
-kernel-core
-@core
-@cloud-server
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Needed initially, but removed below.
-firewalld
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--NetworkManager
--iprutils
--kbd
--uboot-tools
--kernel
--grub2
-
-%end
-
-
-
-%post --erroronfail
-
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
-  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
-  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
-  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
-  echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-# remove the user anaconda forces us to make
-userdel -r none
-
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
-
-# Remove firewalld; was supposed to be optional in F18+, but is required to
-# be present for install/image building.
-echo "Removing firewalld."
-yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
-
-echo -n "Getty fixes"
-# although we want console output going to the serial console, we don't
-# actually have the opportunity to login there. FIX.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-echo "Cleaning old yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
-
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
-echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
-%end
-

fedora-desktop-packages.ks

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

fedora-docker-base-arm.ks

@@ -1,6 +0,0 @@
-%include fedora-docker-base.ks
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
-
-part /boot --fstype="ext4" --size=500
-part /boot/efi --fstype="vfat" --size=100

fedora-docker-base-ppc.ks

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

fedora-docker-base.ks

@@ -1,95 +0,0 @@
-# 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
-#
-
-cmdline
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-user --name=none
-
-keyboard us
-zerombr
-clearpart --all
-part / --fstype ext4 --grow
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-%packages --excludedocs --instLangs=en --nocore
-bash
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
-fedora-release
-rootfiles
-vim-minimal
-dnf
-dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
-sssd-client
-#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
--kernel
-
-
-%end
-
-%post --log=/tmp/anaconda-post.log
-
-set -e
-
-# Set the language rpm nodocs transaction flag persistently in the
-# image yum.conf and rpm macros
-
-# remove the user anaconda forces us to make
-userdel -r none
-
-LANG="en_US"
-echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
-
-# Carry these configs for both dnf and yum for users who are calling
-# yum-deprecated directly. This will keep the experience between both
-# consistent
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/yum.conf > /etc/yum.conf.new
-mv /etc/yum.conf.new /etc/yum.conf
-
-awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
-    < /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
-mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
-
-echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-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*
-
-#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
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-# Fix /run/lock breakage since it's not tmpfs in docker
-umount /run
-systemd-tmpfiles --create --boot
-
-%end

fedora-i386-cloud.ks

@@ -0,0 +1,20 @@
+%include fedora-cloud-base.ks
+
+# Package list.
+%packages
+kernel-PAE
+
+%end
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel-PAE
+EOF
+fi
+%end

fedora-install-fedora.ks

@@ -0,0 +1,152 @@
+# 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
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+
+# 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 --nobase
+
+# 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*
+-GConf2-dbus*
+-bluez-gnome
+# Periods cause problems in paterns, so replace with *s
+-java-1*8*0-openjdk
+-community-mysql*
+-jruby*
+
+# core
+kernel*
+dracut-*
+
+# Desktops
+
+## common stuff
+@base-x
+@guest-desktop-agents
+@guest-agents
+@standard
+@core
+@dial-up
+@fonts
+@input-methods
+@multimedia
+@hardware-support
+@printing
+@admin-tools
+@basic-desktop
+
+## GNOME
+@firefox
+@gnome-desktop
+@epiphany
+@libreoffice
+@gnome-games
+
+## KDE
+@kde-desktop
+@kde-apps
+@kde-education
+@kde-media
+@kde-office
+
+## XFCE
+@xfce-desktop
+@xfce-apps
+@xfce-extra-plugins
+@xfce-media
+@xfce-office
+
+## LXDE
+@lxde-desktop
+@lxde-apps
+@lxde-media
+@lxde-office
+
+## SUGAR
+@sugar-desktop
+@sugar-apps
+
+## MATE
+@mate-desktop
+
+## CINNAMON
+@cinnamon-desktop
+
+# Workstation
+@eclipse
+@development-libs
+@development-tools
+@c-development
+@rpm-development-tools
+@fedora-packager
+@gnome-software-development
+@kde-software-development
+@x-software-development
+@virtualization
+@web-server
+@mongodb
+@perl-web
+@php
+@python-web
+@rubyonrails
+@mysql
+@sql-server
+@design-suite
+## Not included yet due to space concerns
+#@jbossas
+#@milkymist
+#@mingw32
+#@ocaml
+#@robotics-suite
+#@electronic-lab
+
+# Things needed for installation
+@anaconda-tools
+
+# Langpacks
+autocorr-*
+eclipse-nls-*
+hunspell-*
+hyphen-*
+calligra-l10n-*
+kde-l10n-*
+libreoffice-langpack-*
+man-pages-*
+mythes-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end

fedora-kde-packages.ks

@@ -1,17 +1,11 @@
 %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
@@ -21,9 +15,5 @@ mariadb-embedded
 mariadb-libs
 mariadb-server
 
-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
 %end
 

fedora-live-astronomy_kde.ks

@@ -1,134 +0,0 @@
-#fedora-live-astronomy-kde.ks
-# With KDE Desktop
-
-# Fedora Astronomy: For astronomers and astrophysicists
-# Fedora-Astronomy aims to create a Fedora which has the generic
-# toolset for the astronomer
-#
-# Web: https://fedoraproject.org/wiki/SIGs/Astronomy/AstroSpin
-#
-# Partly based on Scientific KDE Spin 
-#     https://fedoraproject.org/wiki/Scientific_Spin
-#
-
-# Maintainer: Christian Dersch <lupinix@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:Lupinix
-
-%include fedora-live-kde.ks
-
-# The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 14500
-
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# astronomical data analysis
-cdsclient
-fpack
-gcx
-psfex
-saoimage
-scamp
-sextractor
-siril
-skyviewer
-swarp
-
-# Observatory: KStars + INDI drivers + Skychart
-indi-aagcloudwatcher
-indi-apogee
-indi-eqmod
-indi-gphoto
-indi-sx
-indistarter
-kstars
-stellarium
-
-# misc. astronomy
-celestia
-virtualplanet
-
-# Some astro environment stuff
-astronomy-menus
-astronomy-menus-toplevel
-
-#python 3 and tools/libraries not included from the groups
-python3
-python3-tools
-python3-matplotlib
-python3-scipy
-python3-numpy
-python3-ipython
-python3-ipython-console
-python3-ipython-notebook
-python3-sympy
-python3-networkx
-python3-pandas
-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
-
-# matplotlib backends
-python3-matplotlib-qt4
-python3-matplotlib-qt5
-python3-matplotlib-tk
-
-
-# Python IDE very useful for scientific use
-python3-spyder
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-gimp
-kst
-kst-docs
-kst-fits
-LabPlot
-
-#Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
-ImageMagick
-kate
-kate-plugins
-rlwrap
-screen
-plasma-applet-redshift-control
-
-# Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
--kde-l10n-*
--calligra-l10n-*
-
-%end
-
-%post
-
-%end

fedora-live-base.ks

@@ -10,16 +10,12 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
+auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-zerombr
-clearpart --all
-part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
-network --bootproto=dhcp --device=link --activate
-shutdown
+part / --size 3072 --fstype ext4
+services --enabled=NetworkManager --disabled=network,sshd
 
 %include fedora-repo.ks
 
@@ -38,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
@@ -50,16 +44,9 @@ memtest86+
 anaconda
 @anaconda-tools
 
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
-aajohan-comfortaa-fonts
+# Make live images easy to shutdown and the like in libvirt
+qemu-guest-agent
 
-# 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
@@ -72,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
@@ -90,6 +77,9 @@ exists() {
     \$*
 }
 
+# Make sure we don't mangle the hardware clock on shutdown
+ln -sf /dev/null /etc/systemd/system/hwclock-save.service
+
 livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
   if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
@@ -169,6 +159,12 @@ if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; the
   action "Mounting persistent /home" mountPersistentHome
 fi
 
+# make it so that we don't do writing to the overlay for things which
+# are just tmpdirs/caches
+mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
+mount -t tmpfs vartmp /var/tmp
+[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
+
 if [ -n "\$configdone" ]; then
   exit 0
 fi
@@ -197,7 +193,7 @@ systemctl stop mdmonitor.service 2> /dev/null || :
 systemctl stop mdmonitor-takeover.service 2> /dev/null || :
 
 # don't enable the gnome-settings-daemon packagekit plugin
-gsettings set org.gnome.software download-updates 'false' || :
+gsettings set org.gnome.settings-daemon.plugins.updates active 'false' || :
 
 # don't start cron/at as they tend to spawn things which are
 # disk intensive that are painful on a live image
@@ -206,17 +202,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
 
@@ -287,17 +278,8 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
 
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-# note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
-cat >> /etc/fstab << EOF
-vartmp   /var/tmp    tmpfs   defaults   0  0
-EOF
-
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
-basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
@@ -307,40 +289,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
 
-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
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
 
 # only works on x86, x86_64
 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

fedora-live-cinnamon.ks

@@ -1,51 +0,0 @@
-# fedora-live-cinnamon.ks
-#
-# Description:
-# - Fedora Live Spin with the Cinnamon Desktop Environment
-#
-# Maintainer(s):
-# - Dan Book <grinnz@grinnz.com>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-cinnamon-packages.ks
-
-part / --size=6144
-
-%post
-# cinnamon configuration
-
-# create /etc/sysconfig/desktop (needed for installation)
-
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/cinnamon-session
-DISPLAYMANAGER=/usr/sbin/lightdm
-EOF
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Cinnamon as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# and mark it as executable
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# this goes at the end after all other changes. 
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
-
-%end
-
-

fedora-live-design-suite.ks

@@ -0,0 +1,144 @@
+# fedora-design-suite.ks
+# Based on Live Desktop
+# Description:
+# - A Spin targeted towards professional designers
+# Website: http://fedoraproject.org/wiki/Design_Suite
+# Maintainers:
+# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
+# - Previous maintainer Sebastian Dziallas
+
+%include fedora-live-desktop.ks
+
+#DVD size partition
+part / --size 8192
+
+%packages
+
+# graphics
+blender
+bluefish 
+#cinepaint
+cmyktool
+darktable
+dia
+entangle
+fontforge
+font-manager 
+gimp
+gimp-*-plugin
+gimp-data-extras
+gimp-high-pass-filter
+gimp-normalmap
+gimp-resynthesizer
+gpick
+GREYCstoration-gimp 
+hugin 
+mypaint
+inkscape
+nautilus-image-converter
+optipng
+phatch
+screenruler
+simple-scan
+scribus
+colord-extra-profiles 
+synfigstudio
+xournal
+
+# office
+vym
+pdfshuffler  
+
+# internet
+filezilla
+
+# audio & video
+audacity
+pitivi
+
+# system
+# gtk-recordmydesktop # dropped for space (#887991)
+# network-manager-applet #part of Gnome Desktop
+
+# fonts
+aajohan-comfortaa-fonts
+adobe-source-sans-pro-fonts
+campivisivi-titillium-fonts
+lato-fonts
+overpass-fonts
+
+# removal of duplicated and unneeded applications
+-gnome-boxes
+-gthumb
+-eog
+-gnome-photos
+-rdesktop
+
+# Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-telnet
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+
+%end
+
+%post
+#Override the favorite desktop application in Dash
+cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop']
+#Enable categories in Gnome Shell
+app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
+FOE
+
+# Add link to the Inkscape Course
+cat >> /usr/share/applications/inkscape-course.desktop << FOE
+[Desktop Entry]
+Name=Introduction To Inkscape
+GenericName=Inkscape Course
+Comment=Materials from Máirín Duffy's Inkscape Class
+Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Type=Application
+Icon=fedora-logo-icon
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/inkscape-course.desktop
+
+<<<<<<< HEAD
+=======
+# Add link to the list of design tutorials
+cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
+[Desktop Entry]
+Name=List of design tutorials
+GenericName=Design tutorials
+Comment=List of websites using open source design software
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+Type=Application
+Icon=applications-graphics
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/list-design-tutorials.desktop
+
+>>>>>>> 6d05550... design: fix link for tutorials
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+%end
+

fedora-live-design_suite.ks

@@ -1,116 +0,0 @@
-# fedora-design-suite.ks
-# Based on Live Workstation
-# Description:
-# - A collection of applications targeted towards professional visual designers
-# Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainer:
-# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Credit to Sebastian Dziallas for initiating the project
-
-%include fedora-live-workstation.ks
-
-# Size partition
-part / --size 14336
-
-%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
-gimp-elsamuko
-gimp-fourier-plugin
-gimp-gap
-gimp-help
-gimp-help-browser
-gimp-high-pass-filter
-gimp-layer-via-copy-cut
-gimp-lensfun
-gimp-lqr-plugin
-gimp-normalmap
-gimp-paint-studio
-gimp-resynthesizer
-gimp-save-for-web
-gimp-separate+
-gimp-wavelet-denoise-plugin
-gimpfx-foundry
-gmic-gimp
-inkscape-psd
-inkscape-sozi
-inkscape-table
-#LuxRender-blender Comment that line because i86 support is no longer available
-sane-backends-drivers-scanners
-xsane-gimp
-#YafaRay-blender
-
-# Add extra gnome applications
-gnome-books
-gnome-calendar
-gnome-photos
-
-# Extra wallpapers
-f24-backgrounds-extras-base
-f24-backgrounds-extras-gnome
-f25-backgrounds-extras-base
-f25-backgrounds-extras-gnome
-
-
-# removal of unneeded applications
--gnome-boxes
--eog
--rdesktop
-
-%end
-
-%post
-#Override the favorite desktop application in Dash
-cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
-[org.gnome.shell]
-favorite-apps=['firefox.desktop', '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']
-FOE
-
-# Add link to lists of tutorials
-cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
-[Desktop Entry]
-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
-Type=Application
-Icon=applications-graphics
-Categories=Graphics;Documentation;
-FOE
-chmod a+x /usr/share/applications/list-design-tutorials.desktop
-
-# Add information about Fedora Design Suite
-cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
-[Desktop Entry]
-Name=Design Suite Info
-GenericName=About Design Suite
-Comment=Wiki page of Design Suite
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite
-Type=Application
-Icon=applications-internet
-Categories=Documentation;
-FOE
-chmod a+x /usr/share/applications/fedora-design-suite.desktop
-
-# Add information about Fedora Design Team
-cat >> /usr/share/applications/fedora-design-team.desktop << FOE
-[Desktop Entry]
-Name=Design Team Info
-GenericName=About Design Team 
-Comment=Wiki page of Design Team
-Exec=xdg-open https://fedoraproject.org/wiki/Design
-Type=Application
-Icon=applications-internet
-Categories=Documentation;
-FOE
-chmod a+x /usr/share/applications/fedora-design-team.desktop
-
-# rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-%end

fedora-live-desktop.ks

@@ -1,26 +1,20 @@
-# Maintained by the Fedora Workstation WG:
-# http://fedoraproject.org/wiki/Workstation
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-workstation-packages.ks
-#
-# Disable this for now to see if packagekit is causing
-# compose failures by leaving a gpg-agent around holding /dev/null open.
-#
-#include snippets/packagekit-cached-metadata.ks
+%include fedora-desktop-packages.ks
 
-part / --size 6656
+part / --size 4096
 
 %post
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 
 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=false
 FOE
 
 # don't run gnome-initial-setup
@@ -36,7 +30,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
@@ -45,11 +39,6 @@ FOE
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
   fi
-
-  # Copy Anaconda branding in place
-  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
-    cp -a /usr/share/lorax/product/* /
-  fi
 fi
 
 # rebuild schema cache with any overrides we installed

fedora-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
+ardour
 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
@@ -124,9 +124,6 @@ lv2-triceratops
 lv2-newtonator
 lv2-x42-plugins
 lv2-fomp-plugins
-lv2-sorcer
-lv2-fabla
-lv2-artyfx-plugins
 
 #dssi
 nekobee-dssi
@@ -167,6 +164,9 @@ rtirq
 japa
 radium-compressor
 
+#streaming
+idjc
+
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
@@ -196,12 +196,12 @@ thunderbird
 %post
 
 #setup kickoff favorites
-/bin/mkdir -p /etc/skel/.config
+/bin/mkdir -p /etc/skel/.kde/share/config
 
-JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/kde4/konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<EOF  >> /etc/skel/.config/kickoffrc
+cat <<EOF  >> /etc/skel/.kde/share/config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 EOF

fedora-live-kde-base.ks

@@ -7,46 +7,66 @@
 
 %post
 
-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+DESKTOP="KDE"
+DISPLAYMANAGER="KDE"
+EOF
+
+# make oxygen-gtk the default GTK+ theme for root (see #683855, #689070, #808062)
 cat > /root/.gtkrc-2.0 << EOF
-include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
+include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
-gtk-theme-name="Adwaita"
+gtk-theme-name="oxygen-gtk"
 EOF
 mkdir -p /root/.config/gtk-3.0
 cat > /root/.config/gtk-3.0/settings.ini << EOF
 [Settings]
-gtk-theme-name = Adwaita
+gtk-theme-name = oxygen-gtk
 EOF
 
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << EOF
 
-# set up autologin for user liveuser
-if [ -f /etc/sddm.conf ]; then
-sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
-else
-cat > /etc/sddm.conf << SDDM_EOF
-[Autologin]
-User=liveuser
-Session=plasma.desktop
-SDDM_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
+sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
+
+# set up user liveuser as default user and preselected user
+sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
+sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
+
 # add liveinst.desktop to favorites menu
-mkdir -p /home/liveuser/.config/
-cat > /home/liveuser/.config/kickoffrc << MENU_EOF
+mkdir -p /home/liveuser/.kde/share/config/
+cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
 [Favorites]
-FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-# set executable bit disable KDE security warning
+
+# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
 chmod +x /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
+
+# copy over the icons for liveinst to hicolor
+cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
+cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
+cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
+cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
+cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
+cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
+touch /usr/share/icons/hicolor/
 
 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
@@ -55,17 +75,20 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF
 
-# Disable plasma-pk-updates
-sed -i \
-    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
-    /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \
-    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+# Disable the update notifications of apper 
+cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
+[CheckUpdate]
+autoUpdate=0
+distroUpgrade=0
+interval=0
+APPER_EOF
 
-# Disable baloo
-cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
-[Basic Settings]
-Indexing-Enabled=false
-BALOO_EOF
+# Disable some kded modules
+# apperd: http://bugzilla.redhat.com/948099
+cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
+[Module-apperd]
+autoload=false
+KDEDRC_EOF
 
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
@@ -73,16 +96,24 @@ cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 Enabled=false
 KRES_EOF
 
-# Disable kwallet migrator
-cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
-[Migration]
-alreadyMigrated=true
-KWALLET_EOL
+# Disable nepomuk
+cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
+[Basic Settings]
+Start Nepomuk=false
+
+[Service-nepomukfileindexer]
+autostart=false
+NEPOMUK_EOF
 
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 
+# small hack to enable plasma-netbook workspace on boot
+if strstr "\`cat /proc/cmdline\`" netbook ; then
+   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
+   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
+fi
 EOF
 
 %end

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 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -11,61 +12,54 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=6144
+part / --size=8192
 
 
 %packages
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
+# ship KDE wallpapers instead of GNOME ones
 -desktop-backgrounds-basic
--kdeaccessibility*
-#-ktorrent			# kget has also basic torrent features (~3 megs)
--digikam			# digikam has duplicate functionality with gwenview (~28 megs)
-#-amarok 			# ~23 megs (mysql-embedded etc.)
--kipi-plugins			# ~8 megs + drags in Marble
-#-kdeplasma-addons		# ~16 megs
-#-krusader			# ~4 megs
+kde-wallpapers
 
-# Additional packages that are not default in kde-* groups, but useful
+# Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
+calligra
 #kdeartwork			# only include some parts of kdeartwork
+#twinkle			# (~10 megs)
 fuse
-mediawriter
+liveusb-creator
+#pavucontrol			# pavucontrol has duplicate functionality with kmix
+krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
-# only include kdegames-minimal
--kdegames
-kdegames-minimal
+# kdeedu apps
+blinken
+kalzium
+kanagram
+kgeography
+khangman
+kiten
+klettres
+ktouch
+kturtle
+kwordquiz
+parley
+step
+marble
+kstars
+kalgebra
+kbruch
+kig
+kmplot
+rocs
+cantor
 
-### space issues
+# Cantor backends
+cantor-R		# Cantor R backend, built against R-core at compile time
+maxima			# runtime dependency of the Cantor Maxima backend
+octave			# runtime dependency of the Cantor Octave backend
 
-# fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts			# a compact CJK font, to replace:
--naver-nanum-gothic-fonts		# Korean
--vlgothic-fonts				# Japanese
--adobe-source-han-sans-cn-fonts		# simplified Chinese
--adobe-source-han-sans-tw-fonts 	# traditional Chinese
-
--paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
-#-stix-fonts		# mathematical symbols
-
-# remove input methods to free space
--@input-methods
--scim*
--m17n*
--ibus*
--iok
-
-# save some space (from @standard)
--make
-
-# admin-tools
--gnome-disk-utility
-# kcm_clock still lacks some features, so keep system-config-date around
-#-system-config-date
-# prefer kcm_systemd
--system-config-services
-# prefer/use kusers
--system-config-users
+# KDE 4 translations
+kde-l10n-*
+calligra-l10n-*
 
 ## avoid serious bugs by omitting broken stuff
 

fedora-live-mate-compiz.ks

@@ -1,50 +1,11 @@
-# Desktop with customizations to fit in a CD (package removals, etc.)
 # Maintained by the Fedora Desktop SIG:
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
 %include fedora-mate-packages.ks
-%include fedora-live-minimization.ks
 
-part / --size 6144
-
-%packages
-
-# Drop things for size
--@3d-printing
--brasero
--colord
--fedora-icon-theme
--GConf2
--gnome-bluetooth-libs
--gnome-icon-theme
--gnome-icon-theme-symbolic
--gnome-software
--gnome-themes
--gnome-themes-standard
--gnome-user-docs
-
--@mate-applications
--mate-icon-theme-faenza
-
-# Drop oversized fonts that aren't needed
-
-# Drop things that pull in perl
-
-# Dictionaries are big
-# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
-# strong preference to giving it a go on #fedora-desktop.
-# also see http://bugzilla.gnome.org/681084
-
-# Help and art can be big, too
--gnome-user-docs
--evolution-help
-
-# Legacy cmdline things we don't want
--telnet
-
-%end
+part / --size 4096 
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -58,6 +19,7 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 

fedora-live-minimization.ks

@@ -7,6 +7,7 @@
 -mpage
 -sox
 -hplip
+-hpijs
 -numactl
 -isdn4k-utils
 -autofs
@@ -14,6 +15,11 @@
 -coolkey
 -wget
 
+# qlogic firmwares
+-ql2100-firmware
+-ql2200-firmware
+-ql23xx-firmware
+
 # scanning takes quite a bit of space :/
 -xsane
 -xsane-gimp

fedora-livecd-desktop.ks

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

fedora-livecd-kde.ks

@@ -0,0 +1,76 @@
+# fedora-livecd-kde.ks
+#
+# Description:
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
+#
+# Maintainer(s):
+# - Sebastian Vahl <fedora@deadbabylon.de>
+# - Fedora KDE SIG, http://fedoraproject.org/wiki/SIGs/KDE, kde@lists.fedoraproject.org
+
+%include fedora-live-kde-base.ks
+%include fedora-live-minimization.ks
+
+# DVD payload
+part / --size=4096
+
+
+%packages
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+-scribus			# scribus is too big for the live images
+-kdeartwork-screensavers	# screensavers are not needed on live images
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-desktop but useful
+k3b				# ~15 megs
+-calligra			# don't include whole calligra, just parts of it
+calligra-words
+calligra-sheets			# ~1 megs
+calligra-stage			# ~3 megs
+#kdeartwork			# only include some parts of kdeartwork
+#twinkle			# (~10 megs)
+fuse
+liveusb-creator
+
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts	# a compact CJK font, to replace:
+-nhn-nanum-gothic-fonts	# Korean
+-vlgothic-fonts		# Japanese
+-wqy-zenhei-fonts	# simplified Chinese
+-cjkuni-uming-fonts	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @standard)
+-make
+
+# save space (it pulls in gdisk/udisks2/libicu)
+-gnome-disk-utility
+
+## avoid serious bugs by omitting broken stuff
+
+%end
+
+%post
+%end

fedora-livecd-mate-compiz.ks

@@ -0,0 +1,81 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-mate-compiz.ks
+%include fedora-live-minimization.ks
+
+%packages
+# First, no office
+-planner
+
+# Drop things for size
+-firefox
+-@libreoffice
+
+# A web browser would be nice for a live cd
+midori
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.7.0-openjdk
+-java-1.8.0-openjdk
+
+# Drop things that pull in perl
+-linux-atm
+
+# No printing
+-foomatic-db-ppds
+-foomatic
+
+# Dictionaries are big
+# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
+# strong preference to giving it a go on #fedora-desktop.
+# also see http://bugzilla.gnome.org/681084
+-aspell-*
+-man-pages*
+-words
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+-desktop-backgrounds-basic
+-*backgrounds-extras
+
+# Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-nano
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+
+# Drop some system-config things
+-system-config-boot
+-system-config-language
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+
+%end
+
+%post
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end
+

fedora-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! 
@@ -23,14 +24,15 @@ part / --size 10240
 %packages
 @xfce-desktop
 @xfce-apps
+#@xfce-extra-plugins
+#@xfce-media
+#@xfce-office
+#@firefox
 
-# Security tools
+# Security tools (not ready at the moment)
 @security-lab
 security-menus
 
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
 # save some space
 -autofs
 -acpid
@@ -39,16 +41,13 @@ gnome-keyring-pam
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
--gnumeric
--foomatic-db-ppds
--foomatic
--stix-fonts
--ibus-typing-booster
--xfce4-sensors-plugin
 -man-pages-*
 
 # drop some system-config things
+-system-config-boot
+#-system-config-network
 -system-config-rootpassword
+#-system-config-services
 -policycoreutils-gui
 
 # exclude some packages to save some space
@@ -74,6 +73,10 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
+-picviz-gui
+-prelude-lml
+-prelude-manager
+-prewikka
 -proxychains
 -pyrit
 -raddump
@@ -81,18 +84,21 @@ gnome-keyring-pam
 -safecopy
 -samdump2
 -scalpel
+-sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
 -tripwire
 -wipe
--zmap
 
 %end
 
 %post
 # xfce configuration
 
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)
 
 cat > /etc/sysconfig/desktop <<EOF

fedora-livecd-soas.ks

@@ -26,9 +26,9 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick
+Sugar on a Stick 10 (Unknown)
+Fedora release 20 (Rawhide)
 EOF
-cat /etc/fedora-release >> /boot/olpc_build
 
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF
@@ -51,7 +51,6 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
-org.laptop.Words
 org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
@@ -59,7 +58,6 @@ org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
-org.sugarlabs.StoryActivity
 org.sugarlabs.VisualMatchActivity
 com.garycmartin.Moon
 mulawa.Countries
@@ -76,23 +74,28 @@ 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
-# set Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
 
 # Don't use the default system user (in SoaS liveuser) as nick name
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
+
 # Disable the logout menu item in Sugar
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
+
 # Enable Sugar power management
-cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
-[org.sugarlabs.user]
-default-nick='disabled'
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 
-[org.sugarlabs]
-show-logout=false
+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
 
-[org.sugarlabs.power]
-automatic=true
+# 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]
@@ -106,7 +109,12 @@ disable-lock-screen=true
 FOE
 
 # rebuild schema cache with any overrides we installed
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+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

fedora-livecd-xfce.ks

@@ -16,6 +16,9 @@
 %post
 # xfce configuration
 
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)
 
 cat > /etc/sysconfig/desktop <<EOF
@@ -30,7 +33,7 @@ mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
-WebBrowser=firefox
+WebBrowser=midori
 FOE
 
 # disable screensaver locking (#674410)

fedora-livedvd-electronic-lab.ks

@@ -0,0 +1,59 @@
+# Description : Live DVD image for Fedora/Free Electronic Lab
+#
+# Maintainer(s):
+# - Chitlesh Goorah <chitlesh a fedoraproject.org>
+# - Thibault North  <tnorth   a fedoraproject.org>
+
+%include fedora-livecd-desktop.ks
+
+# DVD payload
+part / --size 10240
+
+%packages
+
+@electronic-lab
+
+# Support for the Milkymist hardware community
+@milkymist
+
+
+# Office
+dia
+vym
+libreoffice-writer
+libreoffice-calc
+libreoffice-impress
+#libreoffice-extendedPDF
+planner
+graphviz
+
+
+# debugging tools
+make
+gdb
+valgrind
+kdbg
+wireshark-gnome
+qemu
+
+
+# EDA/CAD department
+perl-Test-Pod
+perl-Test-Pod-Coverage
+
+
+# Removing unnecessary packages from the desktop spin
+-abiword
+-@games
+-gimp
+-gimp-libs
+-gimp-data-extras
+-kdebluetooth
+-kbluetooth
+-rdesktop
+
+%end
+
+%post
+
+%end

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 - maniadrive isn't building with php7
-#maniadrive-music
+maniadrive
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-#neverball #cut for size
+neverball
 nogravity
-#pinball # Would pull in fluid-soundfont-lite-patches
+pinball
 scorched3d
-# supertux # Crashing
-#supertuxkart #remove for size
+supertux
+supertuxkart
 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,18 @@ 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 +108,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 +122,7 @@ ballbuster
 CriticalMass
 dd2
 KoboDeluxe
-# lacewing # Would pull in fluid-soundfont-lite-patches
+lacewing
 Maelstrom
 methane
 njam
@@ -135,13 +131,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 +149,6 @@ pingus
 # puzzles (small)
 
 escape
-# gbrainy Removed for space - only game that pulls in mono
 magicor
 mirrormagic
 pipenightdreams
@@ -174,6 +169,7 @@ celestia
 childsplay
 gcompris
 planets
+stellarium
 tuxpaint
 tuxpaint-stamps
 tuxtype2

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
@@ -78,6 +78,7 @@ firefox
 -ntsysv
 
 # Drop some system-config things
+-system-config-boot
 -system-config-language
 -system-config-network
 -system-config-rootpassword
@@ -102,9 +103,9 @@ disable-lock-screen=true
 FOE
 
 # disable updates plugin
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
+cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
+[org.gnome.settings-daemon.plugins.updates]
+active=false
 FOE
 
 # make the installer show up

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,26 +48,21 @@ ddd
 valgrind
 
 #python 2 tools/libraries not included from the groups
-python-tools
 python-ipython
 python-ipython-console
 python-ipython-notebook
 sympy
 python-networkx
-python-pandas
 
 #python 3 and tools/libraries not included from the groups
 python3
-python3-tools
 python3-matplotlib
 python3-scipy
 python3-numpy
 python3-ipython
 python3-ipython-console
 python3-ipython-notebook
-python3-sympy
 python3-networkx
-python3-pandas
 
 # matplotlib backends
 python-matplotlib-qt4
@@ -84,10 +83,6 @@ rkward
 # GUI for Octave
 qtoctave
 
-# julia
-julia
-julia-doc
-
 # IDEs for the IDE folks
 @eclipse
 spyder
@@ -110,6 +105,8 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
+pvm
+pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi
@@ -133,9 +130,9 @@ backintime-kde
 libotf
 
 #root
-#root
-#root-gui-fitpanel
-#root-python
+root
+root-gui-fitpanel
+root-python
 
 #Multiple jobs/clustering system
 # torque
@@ -153,8 +150,8 @@ xzgv
 gimp
 ggobi
 ggobi-devel
-#g3data
-#Mayavi
+g3data
+Mayavi
 
 #Misc. Utils
 screen
@@ -173,4 +170,4 @@ firefox
 
 %post
 
-%end
+%end

fedora-lxde-packages.ks

@@ -12,10 +12,7 @@
 @lxde-apps
 @lxde-media
 @lxde-office
-@networkmanager-submodules
-
-# FIXME: can be omitted once comps is updated
-midori
+@firefox
 
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -38,6 +35,9 @@ metacity
 #-man-pages-*
 #-words
 
+# use ssmtp
+ssmtp
+
 # save some space
 -autofs
 -acpid
@@ -50,9 +50,13 @@ metacity
 -stix-fonts
 -ibus-typing-booster
 -xscreensaver-extras
-#-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
+-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
+
+# FIXME: can be removed once mtpaint is gone from lxde-apps in comps
+-mtpaint
 
 # drop some system-config things
+-system-config-boot
 #-system-config-language
 -system-config-network
 -system-config-rootpassword

fedora-mate-packages.ks

@@ -1,4 +1,5 @@
 %packages
+-realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 firefox
 @mate
@@ -7,51 +8,22 @@ compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
-compiz-plugins-experimental
+compiz-plugins-unsupported
+compiz-bcop
+compiz-mate
 libcompizconfig
 compiz-plugins-main
 ccsm
-simple-ccsm
 emerald-themes
 emerald
 fusion-icon
-@networkmanager-submodules
-blueman
-
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-
-# more backgrounds
-f25-backgrounds-base
-f25-backgrounds-mate
-f25-backgrounds-extras-base
-
-# system tools
-system-config-printer
-system-config-printer-applet
-lightdm-gtk-greeter-settings
-
-# audio video
-parole
-exaile
-PackageKit-gstreamer-plugin
-
-# blacklist applications which breaks mate-desktop
--audacious
-
-# office
+fusion-icon-gtk
 @libreoffice
 
-# dsl tools
-rp-pppoe
-
-# some tools
-p7zip
-p7zip-plugins
-
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
 
+# This one needs to be kicked out of @standard
+-smartmontools
 %end

fedora-repo-not-rawhide.ks

@@ -1,4 +1,3 @@
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch

fedora-repo-rawhide.ks

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

fedora-repo.ks

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

fedora-soas-packages.ks

@@ -8,6 +8,7 @@
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Mel Chua <mchua AT fedoraproject DOT org>
 
+
 %packages
 -@fonts
 -@dial-up
@@ -28,20 +29,6 @@
 -realmd
 -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
@@ -54,9 +41,6 @@ lightdm-gtk
 # 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
@@ -78,10 +62,14 @@ pulseaudio-utils
 # Usefulness for DSL connections as per:
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools
 
 # Get the Sugar boot screen
 -plymouth-system-theme
 -plymouth-theme-charge
 sugar-logos
+-sugar-write
 
 %end

fedora-virt-server.ks.in

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

fedora-workstation-packages.ks

@@ -1,30 +0,0 @@
-%packages
-
-# Exclude unwanted groups that fedora-live-base.ks pulls in
--@dial-up
--@input-methods
--@standard
-
-# Make sure to sync any additions / removals done here with
-# workstation-product-environment in comps
-@base-x
-@core
-@firefox
-@fonts
-@gnome-desktop
-@guest-desktop-agents
-@hardware-support
-@libreoffice
-@multimedia
-@networkmanager-submodules
-@printing
-@workstation-product
-
-# Branding for the installer
-fedora-productimg-workstation
-
-# Exclude unwanted packages from @anaconda-tools group
--gfs2-utils
--reiserfs-utils
-
-%end

fedora-x86_64-cloud.ks

@@ -0,0 +1,18 @@
+%include fedora-cloud-base.ks
+
+%packages
+kernel
+%end
+
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel
+EOF
+fi

fedora-xfce-packages.ks

@@ -12,7 +12,6 @@
 
 %packages
 
-@networkmanager-submodules
 @xfce-desktop
 @xfce-apps
 @xfce-extra-plugins
@@ -21,17 +20,6 @@
 
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
-# Admin tools are handy to have
-@admin-tools
-# Add some screensavers, people seem to like them
-# Note that blank is still default.
-xscreensaver-extras
-wget
-# Handy for debugging
-rfkill
-# Better more popular browser
-firefox
-system-config-printer
 
 # save some space
 -autofs
@@ -41,6 +29,19 @@ system-config-printer
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
+-gnumeric
+-foomatic-db-ppds
+-foomatic
+-stix-fonts
+-ibus-typing-booster
 -xfce4-sensors-plugin
+#-man-pages-*
+
+# drop some system-config things
+-system-config-boot
+-system-config-network
+-system-config-rootpassword
+#-system-config-services
+-policycoreutils-gui
 
 %end

l10n/fedora-livecd-desktop-de_CH.ks

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

l10n/fedora-livecd-desktop-de_DE.ks

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

l10n/fedora-livecd-desktop-fr_FR.ks

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

l10n/fedora-livecd-desktop-nl_NL.ks

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

l10n/fedora-livecd-desktop-pt_BR.ks

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

l10n/fedora-livecd-desktop-pt_PT.ks

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

l10n/fedora-livecd-desktop-ru_RU.ks

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

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
+

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
+

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

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

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

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

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

snippets/packagekit-cached-metadata.ks

@@ -1,53 +0,0 @@
-# %post script to include initial metadata for PackageKit
-
-%post --nochroot
-# Copy over files needed for networking inside the chroot
-for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && cp $f /mnt/sysimage/$f.kickstart
-done
-%end
-
-%post
-
-# Use host machine's resolv.conf and hosts files
-for f in /etc/resolv.conf /etc/hosts ; do
-  test -f $f && mv $f $f.orig
-  test -f $f.kickstart && mv -f $f.kickstart $f
-done
-
-PK_PREFIX=`mktemp -d`
-mkdir -p $PK_PREFIX/etc/yum.repos.d
-if [ -f /etc/yum.repos.d/fedora.repo ] ; then
-  cp /etc/yum.repos.d/fedora.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-/compose/Everything/$basearch/os/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-updates.repo ] ; then
-  cp /etc/yum.repos.d/fedora-updates.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates/$basearch/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-updates.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-updates-testing.repo ] ; then
-  cp /etc/yum.repos.d/fedora-updates-testing.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/mash/updates/f$releasever-updates-testing/$basearch/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-updates-testing.repo
-fi
-if [ -f /etc/yum.repos.d/fedora-rawhide.repo ] ; then
-  cp /etc/yum.repos.d/fedora-rawhide.repo $PK_PREFIX/etc/yum.repos.d/
-  sed -i -e 's|^metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch|baseurl=http://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-/compose/Everything/$basearch/os/|' \
-         $PK_PREFIX/etc/yum.repos.d/fedora-rawhide.repo
-fi
-rpm --root=$PK_PREFIX --initdb
-DESTDIR=$PK_PREFIX /usr/libexec/packagekit-direct refresh
-if [ -d /var/cache/PackageKit ] ; then
-  mv $PK_PREFIX/var/cache/PackageKit/* /var/cache/PackageKit/
-fi
-rm -rf $PK_PREFIX
-
-# Restore original resolv.conf and hosts files
-for f in /etc/resolv.conf /etc/hosts ; do
-  rm -f $f
-  test -f $f.orig && mv $f.orig $f
-done
-
-%end

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,}
+

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

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

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

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