Drop mtpaint exclusion, already in comps

LXDE: Switch from firefox to midori
LXDE: Drop ssmtp, we no longer have a smtpd in the default install
2013-12-04 16:01:54 +01:00 · 2013-12-04 16:01:40 +01:00 · 2013-12-04 16:01:25 +01:00 · 2013-11-26 13:37:01 -06:00 · 2013-11-26 10:20:47 -06:00 · 2013-11-26 10:20:45 -06:00
172 changed files with 3561 additions and 3581 deletions
--- a/2
+++ b/2
@ -18,8 +18,6 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
 	mkdir -p -m 755 $(DATADIR)/$(name)/snippets
 	install -m 644 snippets/* $(DATADIR)/$(name)/snippets
 clean:
 	rm -f $(name)-*.tar.gz
--- a/23
+++ b/23
@ -0,0 +1,23 @@
 The master branch is where development takes place:
 - it may contain kickstart files that are broken, or
 - spin concepts that are in the process of being
   approved by the Board (trademark approval), or
 - spin concepts that are in the process of being
   approved by the Spins SIG
 The release specific branches contain spin concepts that:
 - are approved (both by Board and Spin SIG)
 - maintained for the remainder of the release cycle
 git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
 cd spin-kickstarts
 # If you need a specific branch other than master:
 git checkout BRANCHNAME
 # No tag has been added yet tag HEAD with
 git tag VERSION
 git push --tags
 make
 # Publish the released tar ball
 make publish
 # Clean up the generated files:
 make clean
--- a/README.md
+++ b/README.md
@ -1,45 +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.
 Maintainers for each image are listed in the `maintainers.toml` file.
 ## 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
 ## Build logs ##
 To see build logs go to
 https://koji.fedoraproject.org/koji
 "Packages" tab, and filter by Fedora-Workstation-Live for example.
 Technical info about the officialy released images can be found at
 https://kojipkgs.fedoraproject.org/compose/
 # bug reports #
 Bugs should be reported to the spin-kickstarts bugzilla component:
 https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=spin-kickstarts
--- a/custom/fedora-livedvd-haskell.ks
+++ b/custom/fedora-livedvd-haskell.ks
@ -1,4 +1,4 @@
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 part / --size 6000
--- a/custom/qa-test-day.ks
+++ b/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
@ -111,7 +111,7 @@ firefox
 # "EOF" is quoted so that variables are not expanded. Search for "here-document"
 # in man bash.
-cat >> /var/lib/livesys/livesys-session-extra << "EOF"
+cat >> /etc/rc.d/init.d/livesys << "EOF"
 # Create Test Day welcome screen
 # Note that shebang must be written this way, else it is considered as comment
@ -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);
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@ -0,0 +1,99 @@
 # Kickstart file to build the appliance operating
 # system for fedora.
 # This is based on the work at http://www.thincrust.net
 lang C
 keyboard us
 timezone US/Eastern
 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
 # By default the root password is emptied
 #rootpw --iscrypted $1$uw6MV$m6VtUWPed4SqgoW6fKfTZ/
 #
 # Partition Information. Change this as necessary
 # This information is used by appliance-tools but
 # not by the livecd tools.
 #
 part / --size 1024 --fstype ext4 --ondisk sda
 #
 # Repositories
 #
 %include fedora-repo.ks
 #
 # Add all the packages after the base packages
 #
 %packages --excludedocs --nobase
 bash
 kernel
 grub
 e2fsprogs
 passwd
 policycoreutils
 chkconfig
 rootfiles
 yum
 vim-minimal
 acpid
 #needed to disable selinux
 lokkit
 #Allow for dhcp access
 dhclient
 iputils
 #
 # Packages to Remove
 #
 # no need for kudzu if the hardware doesn't change
 -kudzu
 -prelink
 -setserial
 -ed
 # Remove the authconfig pieces
 -authconfig
 -rhpl
 -wireless-tools
 # Remove the kbd bits
 -kbd
 -usermode
 # these are all kind of overkill but get pulled in by mkinitrd ordering
 -mkinitrd
 -kpartx
 -dmraid
 -mdadm
 -lvm2
 -tar
 # selinux toolchain of policycoreutils, libsemanage, ustr
 -policycoreutils
 -checkpolicy
 -selinux-policy*
 -libselinux-python
 -libselinux
 # Things it would be nice to loose
 -fedora-logos
 generic-logos
 -fedora-release-notes
 %end
 #
 # Add custom post scripts after the base post.
 #
 %post
 %end
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@ -0,0 +1,61 @@
 lang en_US.UTF-8
 #keyboard us
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=network
 %include fedora-repo.ks
 %packages
@core
@standard
@hardware-support
@dial-up
 kernel
 kernel-lpae
 chrony
 arm-boot-config
 extlinux-bootloader
 initial-setup
 #lets resize / on first boot
 dracut-modules-growroot
 # remove this in %post
 dracut-config-generic
 # install uboot images
 uboot-beagle
 uboot-beaglebone
 uboot-origen
 uboot-panda
 uboot-smdkv310
 uboot-uevm
 uboot-wandboard_dl
 uboot-wandboard_solo
 uboot-wandboard_quad
 %end
 %post
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 /usr/sbin/a-b-c
 yum -y remove dracut-config-generic
 %end
--- a/fedora-arm-desktop-vfat.ks
+++ b/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
--- a/fedora-arm-desktop.ks
+++ b/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
--- a/fedora-arm-kde-vfat.ks
+++ b/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
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@ -0,0 +1,13 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
 %include fedora-arm-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
--- a/fedora-arm-lxde-vfat.ks
+++ b/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
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@ -0,0 +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
--- a/fedora-arm-mate-vfat.ks
+++ b/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
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@ -0,0 +1,13 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-mate-packages.ks
 %include fedora-arm-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
--- a/fedora-arm-minimal-vfat.ks
+++ b/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
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@ -0,0 +1,20 @@
 %include fedora-arm-base.ks
 %include fedora-arm-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
--- a/fedora-arm-partitioning.ks
+++ b/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
--- a/fedora-arm-soas-vfat.ks
+++ b/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
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@ -0,0 +1,11 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-soas-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
--- a/fedora-arm-vfat-partitioning.ks
+++ b/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
--- a/fedora-arm-xbase.ks
+++ b/fedora-arm-xbase.ks
@ -0,0 +1,20 @@
 %packages
@base-x
@fonts
@input-methods
@multimedia
@printing
 %end
 %post
 # 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.
 cat > /etc/X11/xorg.conf.d/fbdev.conf <<EOF
 Section "Device"
    Identifier  "Display"
    Driver      "fbdev"
 EndSection
 EOF
 %end
--- a/fedora-arm-xfce-vfat.ks
+++ b/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
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@ -0,0 +1,11 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-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
--- a/fedora-budgie-common.ks
+++ b/fedora-budgie-common.ks
@ -1,23 +0,0 @@
 %packages
 fedora-release-budgie
 # Exclude unwanted groups that fedora-live-base.ks pulls in
 -@dial-up
 -@input-methods
 -@standard
 # Install budgie environment
@^budgie-desktop-environment
 # recommended apps
@budgie-desktop-apps
@libreoffice
 libreoffice-draw
 libreoffice-math
 thunderbird
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
 -reiserfs-utils
 %end
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@ -1,22 +0,0 @@
 # fedora-cinnamon-common.ks
 #
 # Description:
 # - Fedora package set for the Cinnamon Desktop Environment
 #
 # Maintainer(s):
 # - Dan Book <grinnz@grinnz.com>
 %packages
 fedora-release-cinnamon
 # install env-group to resolve RhBug:1891500
@^cinnamon-desktop-environment
@libreoffice
 rhythmbox
 # extra backgrounds
 f36-backgrounds-extras-gnome
 %end
--- a/fedora-cloud-base-azure.ks
+++ b/fedora-cloud-base-azure.ks
@ -1,24 +0,0 @@
 # This is a basic Fedora cloud spin designed to work with Azure.
 # Inherit from cloud base
 %include fedora-cloud-base.ks
 %packages
 # Fedora Cloud Base includes the qemu guest agent and it is not
 # required for Azure: https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent
 WALinuxAgent
 %end
 %post --erroronfail
 cat > /etc/ssh/sshd_config.d/50-client-alive-interval.conf << EOF
 ClientAliveInterval 120
 EOF
 cat >> /etc/chrony.conf << EOF
 # Azure's virtual time source:
 # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync#check-for-ptp-clock-source
 refclock PHC /dev/ptp_hyperv poll 3 dpoll -2 offset 0
 EOF
 %end
--- a/fedora-cloud-base-gcp.ks
+++ b/fedora-cloud-base-gcp.ks
@ -1,35 +0,0 @@
 # This is a basic Fedora cloud spin designed to work with GCP.
 # Note that GCP prefers UEFI so we'll need to make sure this image
 # is created from a machine that is started in UEFI mode.
 # Inherit from cloud base
 %include fedora-cloud-base.ks
 # Change serial port configuration to recommended default for GCP (ttyS0,38400n8d)
 # Don't show bootloader as it's impossible for the user to get to it in time
 # So we might as well not waste the 1 second on each boot.
 # https://cloud.google.com/compute/docs/import/import-existing-image
 bootloader --timeout=0 --location=mbr --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
 # redefine `services` here to drop cloud-init systemd unit enablements from
 # fedora-cloud-base.ks since we don't use them.
 services --enabled=sshd
 %packages
 # GCP provides its own guest environment.
 google-compute-engine-guest-configs
 -cloud-init
 # Fedora Cloud Base includes the qemu guest agent. GCP prefers
 # that it not be installed  https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent
 %end
 %post --erroronfail
 cat <<EOF > /etc/NetworkManager/conf.d/gcp-mtu.conf
 # In GCP it is recommended to use 1460 as the MTU.
 # Set it to 1460 for all connections.
 # https://cloud.google.com/network-connectivity/docs/vpn/concepts/mtu-considerations
 [connection]
 ethernet.mtu = 1460
 EOF
 %end
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@ -1,69 +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 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 %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
 # Add in sshfs for vagrant-sshfs plugin
 fuse-sshfs
 %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/
 cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf <<EOF
 # For now the vagrant insecure key is an rsa key
 # https://github.com/hashicorp/vagrant/issues/11783
 PubkeyAcceptedKeyTypes=+ssh-rsa
 EOF
 # 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
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@ -1,151 +1,236 @@
-# This is a basic Fedora cloud 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
 # sudo access. The root password is empty and locked by default.
 #
-# This kickstart file is designed to be used with ImageFactory (in Koji).
+# Note that unlike the standard F20 install, this image has /tmp on disk
-#
+# rather than in tmpfs, since memory is usually at a premium.
 # 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://pagure.io/fedora-atomic/raw/master/f/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://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
 #
 # This kickstart file is designed to be used with appliance-creator and
 # may need slight modification for use with actual anaconda or other tools.
 # We intend to target anaconda-in-a-vm style image building for F20.
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 auth --useshadow --enablemd5
 selinux --enforcing
 rootpw --lock --iscrypted locked
-firewall --disabled
+# this is actually not used, but a static firewall
 # matching these rules is generated below.
 firewall --service=ssh
-# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
+bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
 bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+network --bootproto=dhcp --device=eth0 --onboot=on
 services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
-# Configure for gpt with bios+uefi
+
-clearpart --all --initlabel --disklabel=gpt
+zerombr
-part prepboot  --size=4    --fstype=prepboot
+clearpart --all
-part biosboot  --size=1    --fstype=biosboot
+part / --size 2048 --fstype ext4
 part /boot/efi --size=100  --fstype=efi
 part /boot     --size=1000  --fstype=ext4 --label=boot
 part btrfs.007 --size=2000 --fstype=btrfs --grow
 btrfs none --label=fedora btrfs.007
 btrfs /home --subvol --name=home LABEL=fedora
 btrfs /     --subvol --name=root LABEL=fedora
 %include fedora-repo.ks
 reboot
-##### begin package list #############################################
+# Package list.
-%packages --instLangs=en
+%packages
@core
 grubby
-# Include packages for the cloud-server-environment group
+# cloud-init does magical things with EC2 metadata, including provisioning
-@^cloud-server-environment
+# a user account with ssh keys.
 cloud-init
-# Don't include the kernel toplevel package since it pulls in
+# this is used by openstack's cloud orchestration framework (and it's small)
-# kernel-modules. We're happy for now with kernel-core.
+heat-cfntools
 -kernel
 kernel-core
-# Don't include dracut-config-rescue. It will have dracut generate a
+# need this for growpart, because parted doesn't yet support resizepart
-# "rescue" entry in the grub menu, but that also means there is a
+# https://bugzilla.redhat.com/show_bug.cgi?id=966993
-# rescue kernel and initramfs that get created, which (currently) add
+cloud-utils-growpart
-# about another 40MiB to the /boot/ partition. Also the "rescue" mode
+
-# is generally not useful in the cloud.
+# We need this image to be portable; also, rescue mode isn't useful here.
 dracut-config-generic
 -dracut-config-rescue
-# Plymouth provides a graphical boot animation. In the cloud we don't
+syslinux-extlinux 
-# need a graphical boot animation. This also means anaconda won't put
+
-# rhgb/quiet on kernel command line
+# 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
 -plymouth
 -NetworkManager
 -iprutils
 -kbd
 # Install qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To
 # improve the integration with OpenStack and other VM management
 # systems (oVirt, KubeVirt).
 qemu-guest-agent
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld
 # Don't include the geolite2 databases, which end up with 66MiB
 # in /usr/share/GeoIP
 -geolite2-country
 -geolite2-city
 %end
 ##### end package list ###############################################
-##### begin kickstart post ###########################################
+
 %post --erroronfail
-if [ "$(arch)" = "x86_64" ]; then
+# Create grub.conf for EC2. This used to be done by appliance creator but
-# Set up legacy BIOS boot if we booted from UEFI
+# anaconda doesn't do it. And, in case appliance-creator is used, we're
-grub2-install --target=i386-pc /dev/vda
+# overriding it here so that both cases get the exact same file.
-fi
+# 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)" >> /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
 # Blivet sets pmbr_boot flag erroneously and we need to purge it
 # otherwise it'll fail to boot
 parted /dev/vda disk_set pmbr_boot off
-# linux-firmware is installed by default and is quite large. As of mid 2020:
+#link grub.conf to menu.lst for ec2 to work
-#   Total download size: 97 M
+echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-#   Installed size: 268 M
+ln -sf grub.conf /boot/grub/menu.lst
-# So far we've been fine shipping without it so let's continue.
+ln -sf /boot/grub/grub.conf /etc/grub.conf
-# More discussion about this in #1234504.
+
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
 # 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 .
 # If you want to remove rsyslog and just use journald, remove this!
 echo -n "Disabling persistent journal"
 rmdir /var/log/journal/ 
 echo . 
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
-rpm -e linux-firmware
+yum -C -y remove linux-firmware
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.
 echo "Removing 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."
 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-name-slot.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"
 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
 # See the systemd-random-seed.service man page that says:
 #   " It is recommended to remove the random seed from OS images intended
 #     for replication on multiple systems"
 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed
-echo "Import RPM GPG key"
+echo "Cleaning old yum repodata."
-releasever=$(rpm --eval '%{fedora}')
+yum history new
-basearch=$(uname -i)
+yum clean all
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+truncate -c -s 0 /var/log/yum.log
 echo "Fixing SELinux contexts."
 /usr/sbin/fixfiles -R -a restore
 echo "Zeroing out empty space."
 # Create zeros file with nodatacow and no compression
 touch /var/tmp/zeros
 chattr +C /var/tmp/zeros
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 echo "(Don't worry -- that out-of-space error was expected.)"
 # Force sync to disk (Cf. https://pagure.io/cloud-sig/issue/340#comment-743430)
 btrfs filesystem sync /
 rm -f /var/tmp/zeros
-btrfs filesystem sync /
+echo "(Don't worry -- that out-of-space error was expected.)"
 # When we build the image a networking config file gets left behind.
 # Let's clean it up.
 echo "Cleanup leftover networking configuration"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # Truncate the /etc/resolv.conf left over from NetworkManager during the
 # kickstart. This causes delays in boot with cloud-init because the
 # 192.168.122.1 DNS server cannot be reached.
 truncate -s 0 /etc/resolv.conf
 # Clear machine-id on pre generated images
 truncate -s 0 /etc/machine-id
 %end
-##### end kickstart post ############################################
+
--- a/fedora-comp-neuro-common.ks
+++ b/fedora-comp-neuro-common.ks
@ -1,29 +0,0 @@
 # Description: Packages for the NeuroFedora computational neuroscience lab image.
 #
 # Maintained by the NeuroFedora SIG:
 # https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 %packages
 fedora-release-compneuro
 # Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
@python-science
 #Computational neuroscience packages
 arbor
 genesis-simulator
 moose
 nest
 neuron
 neuron-devel
 python3
 python3-brian2
 python3-ipython
 python3-lfpy
 python3-nest
 python3-netpyne
 python3-neuron
 python3-pynn
 python3-steps
 %end
--- a/fedora-container-base-minimal.ks
+++ b/fedora-container-base-minimal.ks
@ -1,70 +0,0 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.
 %include fedora-container-common.ks
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 microdnf
 %end
 %post --erroronfail --log=/root/anaconda-post.log
 # remove some random help txt files
 rm -fv usr/share/gnupg/help*.txt
 # Pruning random things
 rm usr/lib/rpm/rpm.daily
 rm -rfv usr/lib64/nss/unsupported-tools/  # unsupported
 # Statically linked crap
 rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
 ln usr/bin/ln usr/sbin/sln
 # Remove some dnf info
 rm -rfv /var/lib/dnf
 # don't need icons
 rm -rfv /usr/share/icons/*
 #some random not-that-useful binaries
 rm -fv /usr/bin/pinky
 # we lose presets by removing /usr/lib/systemd but we do not care
 rm -rfv /usr/lib/systemd
 # if you want to change the timezone, bind-mount it from the host or reinstall tzdata
 rm -fv /etc/localtime
 mv /usr/share/zoneinfo/UTC /etc/localtime
 rm -rfv  /usr/share/zoneinfo
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*
 %end
 %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
 set -eux
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 # NOTE: run this in nochroot because "umount" does not exist in chroot
 umount /mnt/sysimage/run
 # The file that specifies the /run/lock tmpfile is
 # /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
 # rpm that isn't included in this image. We'll create the /run/lock
 # file here manually with the settings from legacy.conf
 # NOTE: chroot to run "install" because it is not in anaconda env
 chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
 # NOTE: run this in nochroot because "find" does not exist in chroot
 KEEPLANG=en_US
 for dir in locale i18n; do
    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
 done
 %end
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@ -1,57 +0,0 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora image with python3 and dnf
 %include fedora-container-common.ks
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 rootfiles
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sudo
 -glibc-langpack-en
 -langpacks-en
 %end
 %post --erroronfail --log=/root/anaconda-post.log
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 #
 # We ignore the return code of the systemd-tmpfiles command because
 # at this point we have already removed the /etc/machine-id and all
 # tmpfiles lines with %m in them will fail and cause a bad return
 # code. Example failure:
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
 rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*
 %end
 %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
 set -eux
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
 # NOTE: run this in nochroot because "find" does not exist in chroot
 KEEPLANG=en_US
 for dir in locale i18n; do
    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
 done
 %end
--- a/fedora-container-common.ks
+++ b/fedora-container-common.ks
@ -1,88 +0,0 @@
 # This is the common bits between Fedora Container base image.
 #
 # To keep this image minimal it only installs English language. You need to change
 # dnf configuration in order to enable other languages.
 #
 # ##  Hacking on this image ###
 # This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
 # but you can run imagefactory locally too.
 #
 # To do so, testing local changes, first you'll need a TDL file.  I store one here:
 # https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 #
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
 #
 #   ksflatten -c fedora-container-base[-minimal].ks -o fedora-container-base-test.ks
 #   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-base-test.ks docker
 #
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 bootloader --disabled
 timezone --isUtc Etc/UTC
 timesource --ntp-disable
 rootpw --lock --iscrypted locked
 keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 # boot partitions are irrelevant as the final docker image is a tarball
 zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 fedora-release-container
 bash
 coreutils
 glibc-minimal-langpack
 rpm
 util-linux-core
 -kernel
 -dosfstools
 -e2fsprogs
 -fuse-libs
 -gnupg2-smime
 -libss # used by e2fsprogs
 -pinentry
 -shared-mime-info
 -trousers
 -xkeyboard-config
 -grubby
 -langpacks-en_GB
 # https://bugzilla.redhat.com/show_bug.cgi?id=1951111
 -util-linux
 -sssd-client
 %end
 %post --erroronfail --log=/root/anaconda-post.log
 set -eux
 # Set install langs macro so that new rpms that get installed will
 # only install langs that we limit it to.
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
 # https://bugzilla.redhat.com/show_bug.cgi?id=1727489
 echo 'LANG="C.UTF-8"' >  /etc/locale.conf
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
 releasever=$(rpm --eval '%{?fedora}')
 # When building ELN containers, we don't have the %{fedora} macro
 if [ -z $releasever ]; then
  releasever=eln
 fi
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "# fstab intentionally empty for containers" > /etc/fstab
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 echo "# resolv placeholder" > /etc/resolv.conf
 chmod 644 /etc/resolv.conf
 %end
--- a/fedora-design-suite-common.ks
+++ b/fedora-design-suite-common.ks
@ -1,31 +0,0 @@
 %packages
 # Switch to groups for design suite
@design-suite
 # Identify as Fedora Design Suite
 fedora-release-designsuite
 # Provides backup application
 deja-dup
 deja-dup-nautilus
 # Add extra gnome applications
 #gnome-books
 gnome-calendar
 gnome-photos
 gnome-pomodoro
 gnome-todo
 # Add cosmetic for terminal
 powerline
 powerline-fonts
 # removal of unneeded applications
 -gnome-boxes
 # temporarily removing conflicting application
 -mypaint
 -sparkleshare
 %end
--- a/fedora-desktop-packages.ks
+++ b/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
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@ -1,93 +0,0 @@
 # fedora-disk-base.ks
 #
 # Defines the basics for all kickstarts in the fedora-live branch
 # Does not include package selection (other then mandatory)
 # Does not include localization packages or configuration
 #
 # Does includes "default" language configuration (kickstarts including
 # this template can override these settings)
 text
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 selinux --enforcing
 firewall --enabled --service=mdns
 services --enabled=sshd,NetworkManager,chronyd
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
 bootloader --timeout=1
 zerombr
 clearpart --all --initlabel --disklabel=msdos
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 %include fedora-repo.ks
 %packages
@core
@standard
@hardware-support
 kernel
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
@arm-tools
 chrony
 bcm283x-firmware
 initial-setup
 # Intel wireless firmware assumed never of use for disk images
 -iwl*
 -ipw*
 -usb_modeswitch
 -generic-release*
 # make sure all the locales are available for inital-setup and anaconda to work
 glibc-all-langpacks
 %end
 %post
 # Find the architecture we are on
 arch=$(uname -m)
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 fi
 releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # remove random seed, the newly installed instance should make it's own
 rm -f /var/lib/systemd/random-seed
 # The enp1s0 interface is a left over from the imagefactory install, clean this up
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 dnf -y remove dracut-config-generic
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 # Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
 # when you are using fedora via serial console as you do not get any output post grub
 # linux does a good job of knowing what consoles need to be enabled.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
 if [[ $arch == "aarch64" ]]; then
 sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 %end
--- a/fedora-disk-budgie.ks
+++ b/fedora-disk-budgie.ks
@ -1,5 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-budgie-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-kde.ks
+++ b/fedora-disk-kde.ks
@ -1,5 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-kde-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-lxqt.ks
+++ b/fedora-disk-lxqt.ks
@ -1,5 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-lxqt-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@ -1,6 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-minimal-common.ks
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
 autopart --type=plain --noswap
--- a/fedora-disk-phosh.ks
+++ b/fedora-disk-phosh.ks
@ -1,5 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-phosh-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-python-classroom.ks
+++ b/fedora-disk-python-classroom.ks
@ -1,20 +0,0 @@
 # Maintained by the Fedora Python SIG:
 # http://fedoraproject.org/wiki/SIGs/Python
 # mailto:python-devel@lists.fedoraproject.org
 # The Workstion based Python Classroom Lab
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks
 %include fedora-python-classroom-gnome-common.ks
 autopart --type=btrfs --noswap
 %packages
 -initial-setup
 -initial-setup-gui
 -libvirt*
 -gnome-boxes
 %end
--- a/fedora-disk-server.ks
+++ b/fedora-disk-server.ks
@ -1,34 +0,0 @@
 %include fedora-disk-base.ks
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
 autopart --noswap
 %packages
 fedora-release-server
 # install the default groups for the server environment since installing the environment is not working
@server-product
@standard
@core
@headless-management
@hardware-support
@networkmanager-submodules
@container-management
@domain-client
@guest-agents
@server-hardware-support
 -initial-setup-gui
 -generic-release*
 %end
 %post
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 %end
--- a/fedora-disk-soas.ks
+++ b/fedora-disk-soas.ks
@ -1,5 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-soas-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@ -1,11 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks
 autopart --type=btrfs --noswap
 %packages
 -initial-setup
 -initial-setup-gui
 %end
--- a/fedora-disk-xbase.ks
+++ b/fedora-disk-xbase.ks
@ -1,22 +0,0 @@
 %packages
@base-x
@fonts
@input-methods
@multimedia
@printing
 -@guest-desktop-agents
 initial-setup-gui
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
 %end
 %post
 # Explicitly set graphical.target as default as this is how initial-setup detects which version to run
 ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
 %end
--- a/fedora-disk-xfce.ks
+++ b/fedora-disk-xfce.ks
@ -1,5 +0,0 @@
 %include fedora-disk-base.ks
 %include fedora-disk-xbase.ks
 %include fedora-xfce-common.ks
 autopart --type=btrfs --noswap
--- a/fedora-eln-container-base.ks
+++ b/fedora-eln-container-base.ks
@ -1,60 +0,0 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora-ELN image with python3 and dnf
 %include fedora-container-common.ks
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 -fedora-release-container
 fedora-release-eln
 fedora-repos-eln
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sudo
 -glibc-langpack-en
 -langpacks-en
 %end
 %post --erroronfail --log=/root/anaconda-post.log
 set -eux
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker
 # This unmounts /run (tmpfs) and then recreates the files
 # in the /run directory on the root filesystem of the container
 #
 # We ignore the return code of the systemd-tmpfiles command because
 # at this point we have already removed the /etc/machine-id and all
 # tmpfiles lines with %m in them will fail and cause a bad return
 # code. Example failure:
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
 rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*
 %end
 %post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
 set -eux
 # See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
 # NOTE: run this in nochroot because "find" does not exist in chroot
 KEEPLANG=en_US
 for dir in locale i18n; do
    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
 done
 %end
--- a/fedora-eln-guest.ks
+++ b/fedora-eln-guest.ks
@ -1,238 +0,0 @@
 # Kickstart file to build Fedora ELN Guest image.
 # This image is used to test Fedora ELN content for
 # the cloud instances. This image provides minimally configured
 # system image.
 text
 lang en_US.UTF-8
 keyboard us
 timezone --utc America/New_York
 # add console and reorder in %post
 bootloader --timeout=1 --location=mbr --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
 selinux --enforcing
 firewall --enabled --service=ssh
 network --bootproto=dhcp --device=link --activate --onboot=on
 #services --enabled=sshd,ovirt-guest-agent --disabled kdump,rhsmcertd
 services --enabled=sshd,NetworkManager,cloud-init,cloud-init-local,cloud-config,cloud-final --disabled kdump,rhsmcertd
 rootpw --iscrypted nope
 #
 # Partition Information. Change this as necessary
 # This information is used by appliance-tools but
 # not by the livecd tools.
 #
 zerombr
 clearpart --all --initlabel
 # autopart --type=plain --nohome # --nohome doesn't work because of rhbz#1509350
 # autopart is problematic in that it creates /boot and swap partitions rhbz#1542510 rhbz#1673094
 reqpart
 part / --fstype="xfs" --ondisk=vda --size=8000
 reboot
 # Packages
 %packages
@core
 dnf
 kernel
 yum
 nfs-utils
 dnf-utils
 # pull firmware packages out
 -aic94xx-firmware
 -alsa-firmware
 -alsa-lib
 -alsa-tools-firmware
 -ivtv-firmware
 -iwl1000-firmware
 -iwl100-firmware
 -iwl105-firmware
 -iwl135-firmware
 -iwl2000-firmware
 -iwl2030-firmware
 -iwl3160-firmware
 -iwl3945-firmware
 -iwl4965-firmware
 -iwl5000-firmware
 -iwl5150-firmware
 -iwl6000-firmware
 -iwl6000g2a-firmware
 -iwl6000g2b-firmware
 -iwl6050-firmware
 -iwl7260-firmware
 -libertas-sd8686-firmware
 -libertas-sd8787-firmware
 -libertas-usb8388-firmware
 # cloud-init does magical things with EC2 metadata, including provisioning
 # a user account with ssh keys.
 cloud-init
 ## Adding a dependency for cloud-init as recommended by tdawson
 python3-jsonschema
 # rhevm guest-agent (Not available in ELN yet)
 #rhevm-guest-agent-common
 # allows the host machine to issue commands to the guest operating system
 qemu-guest-agent
 # need this for growpart, because parted doesn't yet support resizepart
 # https://bugzilla.redhat.com/show_bug.cgi?id=966993
 #cloud-utils
 #heat-cfntools  # Not available in ELN (yet?)
 cloud-utils-growpart
 # We need this image to be portable; also, rescue mode isn't useful here.
 dracut-config-generic
 # Don't include dracut-config-rescue. It will have dracut generate a
 # "rescue" entry in the grub menu, but that also means there is a
 # rescue kernel and initramfs that get created, which (currently) add
 # about another 40MiB to the /boot/ partition. Also the "rescue" mode
 # is generally not useful in the cloud.
 -dracut-config-rescue
 # Needed initially, but removed below.
 firewalld
 # cherry-pick a few things from @base
 tar
 tcpdump
 rsync
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
 -iprutils
 # Minimal Cockpit web console
 cockpit-ws
 cockpit-system
 subscription-manager-cockpit
 # rh-amazon-rhui-client
 # Exclude all langpacks for now
 -langpacks-*
 # We are building Fedora-ELN
 fedora-release-eln
 fedora-repos-eln
 # Add rng-tools as source of entropy
 rng-tools
 %end
 #
 # Add custom post scripts after the base post.
 #
 %post --erroronfail
 # workaround anaconda requirements
 passwd -d root
 passwd -l root
 # 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
 echo "Removing linux-firmware package."
 dnf -C -y remove linux-firmware
 # Remove firewalld; it is required to be present for install/image building.
 echo "Removing firewalld."
 dnf -C -y remove firewalld --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
 # 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-name-slot.rules
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"
 BOOTPROTO="dhcp"
 BOOTPROTOv6="dhcp"
 ONBOOT="yes"
 TYPE="Ethernet"
 USERCTL="yes"
 PEERDNS="yes"
 IPV6INIT="yes"
 PERSISTENT_DHCLIENT="1"
 EOF
 # set virtual-guest as default profile for tuned
 echo "virtual-guest" > /etc/tuned/active_profile
 # 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 .
 cat <<EOL > /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
 EOL
 # make sure firstboot doesn't start
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 # workaround https://bugzilla.redhat.com/show_bug.cgi?id=966888
 if ! grep -q growpart /etc/cloud/cloud.cfg; then
  sed -i 's/ - resizefs/ - growpart\n - resizefs/' /etc/cloud/cloud.cfg
 fi
 # allow sudo powers to cloud-user
 echo -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
 # Disable subscription-manager yum plugins
 sed -i 's|^enabled=1|enabled=0|' /etc/yum/pluginconf.d/product-id.conf
 sed -i 's|^enabled=1|enabled=0|' /etc/yum/pluginconf.d/subscription-manager.conf
 echo "Cleaning old yum repodata."
 dnf clean all
 # clean up installation logs"
 rm -rf /var/log/yum.log
 rm -rf /var/lib/yum/*
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
 rm -rf /var/log/anaconda*
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
 mkdir -p /var/cache/yum
 /usr/sbin/fixfiles -R -a restore
 # remove random-seed so it's not the same every time
 rm -f /var/lib/systemd/random-seed
 # Remove machine-id on the pre generated images
 cat /dev/null > /etc/machine-id
 # Anaconda is writing to /etc/resolv.conf from the generating environment.
 # The system should start out with an empty file.
 truncate -s 0 /etc/resolv.conf
 %end
--- a/fedora-i3-common.ks
+++ b/fedora-i3-common.ks
@ -1,35 +0,0 @@
 # fedora-livecd-i3.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager i3wm
 #
 # Maintainer(s):
 # - Nasir Hussain    <nasirhm@fedoraproject.org>
 # - Eduard Lucena    <x3mboy@fedoraproject.org>
 # - Justin W. Flory  <jwf@fedoraproject.org>
 # - Dan Cermak       <defolos@fedoraproject.org>
 %packages
@^i3-desktop-environment
 feh
 dex-autostart
 thunar
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
 # Admin tools are handy to have
@admin-tools
 wget
 # Better more popular browser
 system-config-printer
 # save some space
 -autofs
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 %end
--- a/fedora-i386-cloud.ks
+++ b/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
--- a/fedora-install-fedora.ks
+++ b/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
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@ -1,88 +0,0 @@
 # This is the kickstart for Fedora IoT disk images.
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 selinux --enforcing
 rootpw --lock --iscrypted locked
 bootloader --timeout=1 --append="modprobe.blacklist=vc4"
 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=NetworkManager,sshd
 zerombr
 clearpart --all --initlabel --disklabel=msdos
 autopart --nohome --noswap --type=plain
 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
 ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/rawhide/${basearch}/iot
 reboot
 %post --erroronfail
 # Find the architecture we are on
 arch=$(uname -m)
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 fi
 # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
 # We want consumers of this image to track the two week releases.
 ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/rawhide/${arch}/iot"
 # Make sure the ref we're supposedly sitting on (according
 # to the updated origin) exists.
 ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
 # Remove the old ref so that the commit eventually gets cleaned up.
 ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete
 # delete/add the remote with new options to enable gpg verification
 # and to point them at the cdn url
 ostree remote delete fedora-iot
 ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
 # We're getting a stray console= from somewhere, work around it
 rpm-ostree kargs --delete=console=tty0
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
 passwd -l root
 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
 cp /etc/skel/.bash* /var/roothome
 # Remove any persistent NIC rules generated by udev
 rm -vf /etc/udev/rules.d/*persistent-net*.rules
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/random-seed
 echo "Packages within this iot image:"
 echo "-----------------------------------------------------------------------"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 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.)"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init
 # will try to use this information and may error:
 # https://bugs.launchpad.net/cloud-init/+bug/1670052
 truncate -s 0 /etc/resolv.conf
 %end
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@ -1,42 +0,0 @@
 %packages
 # install env-group to resolve RhBug:1891500
@^kde-desktop-environment
@firefox
@kde-apps
@kde-media
@libreoffice
 # add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
 libreoffice-draw
 libreoffice-math
 fedora-release-kde
 -@admin-tools
 # drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124)
 -tracker-miners
 -tracker
 ### The KDE-Desktop
 ### fixes
 # minimal localization support - allows installing the kde-l10n-* packages
 kde-l10n
 # Additional packages that are not default in kde-* groups, but useful
 fuse
 mediawriter
 ### space issues
 -ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
 -kipi-plugins			# ~8 megs + drags in Marble
 -krusader			# ~4 megs
 -k3b				# ~15 megs
 ## avoid serious bugs by omitting broken stuff
 %end
--- a/fedora-kde-packages.ks
+++ b/fedora-kde-packages.ks
@ -0,0 +1,23 @@
 %packages
@kde-apps
@kde-desktop
@kde-media
@kde-telepathy
 ### The KDE-Desktop
 ### fixes
 # sddm->kdm, (temporary) so don't have to wait on comps changes
 -sddm
 -sddm-kcm
 kdm
 # use kde-print-manager instead of system-config-printer
 -system-config-printer
 # make sure mariadb lands instead of MySQL (hopefully a temporary hack)
 mariadb-embedded
 mariadb-libs
 mariadb-server
 %end
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@ -1,136 +0,0 @@
 #fedora-live-astronomy-kde.ks
 # With KDE Desktop
 # Fedora Astronomy: For astronomers and astrophysicists
 # Fedora-Astronomy aims to create a Fedora which has the generic
 # toolset for the astronomer
 #
 # Web: https://fedoraproject.org/wiki/SIGs/Astronomy/AstroSpin
 #
 # Partly based on Scientific KDE Spin 
 #     https://fedoraproject.org/wiki/Scientific_Spin
 #
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 # The recommended part size for DVDs is too close to use for the astronomy spin
 part / --size 16000
 %packages
 # Installing the default/mandatory packages from engineering & scientific
@engineering-and-scientific
 # Basic development
@development-tools
@c-development
 # astronomical data analysis
 astrometry
 astrometry-tycho2
 cdsclient
 fpack
 psfex
 scamp
 sextractor
 #siril
 skyviewer
 swarp
 wcstools
 # Observatory: KStars + INDI drivers
 indi-3rdparty-drivers
 indistarter
 kstars
 # misc. astronomy
 #celestia
 stellarium
 #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-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-qt5
 python3-matplotlib-tk
 # Python IDE very useful for scientific use
 python3-spyder
 # BOINC for distributed computing
 boinc-client
 boinc-manager
 #Version control- a GUI for each as well
 git
 git-gui
 #Drawing, Picture viewing tools, Visualization tools
 dia
 gimp
 kst
 kst-docs
 kst-fits
 # LabPlot currently not installable due to #2044284
 #LabPlot
 #Misc. Utils
 ImageMagick
 kate
 kate-plugins
 rlwrap
 screen
 # Java JRE for VO tools
 java
 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*
 -calligra-l10n-*
 %end
 %post
 %end
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@ -10,97 +10,302 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-zerombr
+part / --size 3072 --fstype ext4
-clearpart --all
+services --enabled=NetworkManager --disabled=network,sshd
 part / --size 5120 --fstype ext4
 services --enabled=NetworkManager,ModemManager --disabled=sshd
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
 %include fedora-repo.ks
 %packages
@base-x
@guest-desktop-agents
@standard
@core
@fonts
@input-methods
@dial-up
@multimedia
@hardware-support
@printing
 # 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
 # for now.
 memtest86+
 # The point of a live image is to install
 anaconda
 anaconda-install-env-deps
 anaconda-live
@anaconda-tools
 # Anaconda has a weak dep on this and we don't want it on livecds, see
 # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
 -fcoe-utils
 -device-mapper-multipath
-# Need aajohan-comfortaa-fonts for the SVG rnotes images
+# Make live images easy to shutdown and the like in libvirt
-aajohan-comfortaa-fonts
+qemu-guest-agent
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
 # provide the livesys scripts
 livesys-scripts
 %end
 %post
-# Enable livesys services
+# FIXME: it'd be better to get this installed from a package
-systemctl enable livesys.service
+cat > /etc/rc.d/init.d/livesys << EOF
-systemctl enable livesys-late.service
+#!/bin/bash
 #
 # live: Init script for live image
 #
 # chkconfig: 345 00 99
 # description: Init script for live image.
 ### BEGIN INIT INFO
 # X-Start-Before: display-manager
 ### END INIT INFO
 . /etc/init.d/functions
 if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then
    exit 0
 fi
 if [ -e /.liveimg-configured ] ; then
    configdone=1
 fi
 exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
 }
 # 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
    livedir=\${arg##rd.live.dir=}
    return
  fi
  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
    livedir=\${arg##live_dir=}
    return
  fi
 done
 # enable swaps unless requested otherwise
 swaps=\`blkid -t TYPE=swap -o device\`
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
  for s in \$swaps ; do
    action "Enabling swap partition \$s" swapon \$s
  done
 fi
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
  action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
 fi
 mountPersistentHome() {
  # support label/uuid
  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
  fi
  # if we're given a file rather than a blockdev, loopback it
  if [ "\${homedev##mtd}" != "\${homedev}" ]; then
    # mtd devs don't have a block device but get magic-mounted with -t jffs2
    mountopts="-t jffs2"
  elif [ ! -b "\$homedev" ]; then
    loopdev=\`losetup -f\`
    if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
      action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
    fi
    losetup \$loopdev \$homedev
    homedev=\$loopdev
  fi
  # if it's encrypted, we need to unlock it
  if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
    echo
    echo "Setting up encrypted /home device"
    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
    homedev=/dev/mapper/EncHome
  fi
  # and finally do the mount
  mount \$mountopts \$homedev /home
  # if we have /home under what's passed for persistent home, then
  # we should make that the real /home.  useful for mtd device on olpc
  if [ -d /home/home ]; then mount --bind /home/home /home ; fi
  [ -x /sbin/restorecon ] && /sbin/restorecon /home
  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
 }
 findPersistentHome() {
  for arg in \`cat /proc/cmdline\` ; do
    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
      homedev=\${arg##persistenthome=}
      return
    fi
  done
 }
 if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
  findPersistentHome
 elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
  homedev=/run/initramfs/live/\${livedir}/home.img
 fi
 # if we have a persistent /home, then we want to go ahead and mount it
 if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
  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
 # add fedora user with no passwd
 action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
 passwd -d liveuser > /dev/null
 usermod -aG wheel liveuser > /dev/null
 # Remove root password lock
 passwd -d root > /dev/null
 # turn off firstboot for livecd boots
 systemctl --no-reload disable firstboot-text.service 2> /dev/null || :
 systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || :
 systemctl stop firstboot-text.service 2> /dev/null || :
 systemctl stop firstboot-graphical.service 2> /dev/null || :
 # don't use prelink on a running live image
 sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
 # turn off mdmonitor by default
 systemctl --no-reload disable mdmonitor.service 2> /dev/null || :
 systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || :
 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.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
 systemctl --no-reload disable crond.service 2> /dev/null || :
 systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :
 # Mark things as configured
 touch /.liveimg-configured
 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 echo "localhost" > /etc/hostname
 EOF
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF
 #!/bin/bash
 #
 # live: Late init script for live image
 #
 # chkconfig: 345 99 01
 # description: Late init script for live image.
 . /etc/init.d/functions
 if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
    exit 0
 fi
 exists() {
    which \$1 >/dev/null 2>&1 || return
    \$*
 }
 touch /.liveimg-late-configured
 # read some variables out of /proc/cmdline
 for o in \`cat /proc/cmdline\` ; do
    case \$o in
    ks=*)
        ks="--kickstart=\${o#ks=}"
        ;;
    xdriver=*)
        xdriver="\${o#xdriver=}"
        ;;
    esac
 done
 # if liveinst or textinst is given, start anaconda
 if strstr "\`cat /proc/cmdline\`" liveinst ; then
   plymouth --quit
   /usr/sbin/liveinst \$ks
 fi
 if strstr "\`cat /proc/cmdline\`" textinst ; then
   plymouth --quit
   /usr/sbin/liveinst --text \$ks
 fi
 # configure X, allowing user to override xdriver
 if [ -n "\$xdriver" ]; then
   cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE
 Section "Device"
 	Identifier	"Videocard0"
 	Driver	"\$xdriver"
 EndSection
 FOE
 fi
 EOF
 chmod 755 /etc/rc.d/init.d/livesys
 /sbin/restorecon /etc/rc.d/init.d/livesys
 /sbin/chkconfig --add livesys
 chmod 755 /etc/rc.d/init.d/livesys-late
 /sbin/restorecon /etc/rc.d/init.d/livesys-late
 /sbin/chkconfig --add 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*
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
-rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
+rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 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
 systemctl disable network
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 %end
 %post --nochroot
 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
--- a/fedora-live-budgie.ks
+++ b/fedora-live-budgie.ks
@ -1,17 +0,0 @@
 # Description:
 # - Fedora Live Spin with the Budgie Desktop Environment
 # 
 # Maintainer(s):
 # - Joshua Strobl <joshua@buddiesofbudgie.org>
 %include fedora-live-base.ks
 %include fedora-budgie-common.ks
 part / --size 7750
 %post
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="budgie"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@ -1,29 +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-cinnamon-common.ks
 part / --size=8192
 %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
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-comp_neuro.ks
+++ b/fedora-live-comp_neuro.ks
@ -1,12 +0,0 @@
 # Description: The Workstation based NeuroFedora computational neuroscience lab image.
 # https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
 #
 # Maintained by the NeuroFedora SIG:
 # https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 %include fedora-live-workstation.ks
 %include fedora-comp-neuro-common.ks
 %include fedora-neuro-gnome-common.ks
 part / --size 10240
--- a/fedora-live-design-suite.ks
+++ b/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 <luya 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-gap
 gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-paint-studio
 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','list-design-tutorials.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
 # 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 design tutorials
 Comment=Reference of graphic and web design related tutorials
 Exec=xdg-open http://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
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 #EOF
 %end
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@ -1,73 +0,0 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
 # A collection of applications for professional visual designers
 # http://fedoraproject.org/wiki/Design_Suite
 # Maintained by Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # Credit to Sebastian Dziallas for initiating the project
 %include fedora-live-workstation.ks
 %include fedora-design-suite-common.ks
 # Size partition
 part / --size 14336
 %post
 # 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
 # Use Powerline in bash
 cat >>  $HOME/.bashrc << FOE
 # Enable powerline daemon
 if [ -f `which powerline-daemon` ]; then
  powerline-daemon -q
  POWERLINE_BASH_CONTINUATION=1
  POWERLINE_BASH_SELECT=1
  . /usr/share/powerline/bash/powerline.sh
 fi
 FOE
 cat >> /var/lib/livesys/livesys-session-extra << FOE
 #Override the favorite desktop application in Dash
 sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
 FOE
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 %end
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@ -0,0 +1,65 @@
 # Maintained by the Fedora Desktop SIG:
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 %include fedora-live-base.ks
 %include fedora-desktop-packages.ks
 part / --size 4096
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
 # disable updates plugin
 cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
 [org.gnome.settings-daemon.plugins.updates]
 active=false
 FOE
 # don't run gnome-initial-setup
 mkdir ~liveuser/.config
 touch ~liveuser/.config/gnome-initial-setup-done
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
  # need to move it to anaconda.desktop to make shell happy
  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
 favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
 FOE
  # Make the welcome screen show up
  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
    mkdir -p ~liveuser/.config/autostart
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
  fi
 fi
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 # set up auto-login
 cat > /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser
 FOE
 # Turn off PackageKit-command-not-found while uninstalled
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 %end
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@ -1,193 +0,0 @@
 # fedora-live-games.ks
 #
 # Maintainers:
 # - Darryl T. Agostinelli <dagostinelli@gmail.com>
 #   https://fedoraproject.org/wiki/User:Dagostinelli
 #
 # - Richard Anaya <richard.anaya@gmail.com>
 #   https://fedoraproject.org/wiki/User:Richardanaya
 #
 # Former Maintainers:
 # - Bruno Wolff III <bruno@wolff.to>
 #   https://fedoraproject.org/wiki/User:Bruno
 #
 # - Rahul Sundaram <sundaram@fedoraproject.org>
 #   https://fedoraproject.org/wiki/User:Sundaram
 #
 %include fedora-live-xfce.ks
 # The recommended part size for DVDs is too close to use for the games spin
 part / --size 14336
 %packages
 # Wine pulls in i386 libraries under x86_86 making that spin too big.
 # Also the point is to show off Fedora games, not running windows games.
 -wine
 # Remove libreoffice since it just got added to livecd-desktop and
 # 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
 # games
 # traditional (big)
 #alienarena #Cut for size
 armacycles-ad
 asc
 asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 bzflag
 crossfire-client
 extremetuxracer
 # flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
 freedroidrpg
 frozen-bubble
 # glob2 - currently broken
 lincity-ng
 #tmw - currently broken
 #maniadrive - currently broken
 #maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
 neverball
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
 supertuxkart
 ultimatestunts
 warzone2100
 wesnoth
 # worminator # Would pull in fluid-soundfont-lite-patches
 warmux
 xmoto
 # traditional (small)
 abe
 # alex4 # Would pull in fluid-soundfont-lite-patches
 # ballz # Would pull in fluid-soundfont-lite-patches
 blobwars
 bombardier
 cdogs-sdl
 clanbomber
 colossus
 foobillard
 glaxium
 gnubg
 gnugo
 haxima
 #hedgewars -- broken
 kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
 pachi
 pioneers
 quarry
 # Ri-li cut for size
 # rogue # recently abandoned. Someone picked it up. Waiting for approval.
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 solarwolf
 sopwith
 stormbaancoureur
 ularn
 xblast
 # arcade classics(ish) (big)
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
 trackballs
 trackballs-music
 # arcade classics(ish) (small)
 ballbuster
 CriticalMass
 dd2
 KoboDeluxe
 # lacewing # Would pull in fluid-soundfont-lite-patches
 Maelstrom
 methane
 njam
 shippy
 tecnoballz
 wordwarvi
 xgalaxy
 # zasx # Would pull in fluid-soundfont-lite-patches
 # falling blocks games (small)
 amoebax
 crack-attack
 # crystal-stacker # Would pull in fluid-soundfont-lite-patches
 gemdropx
 gweled
 # puzzles (big)
 enigma
 # fillets-ng # broken in f34
 pingus
 # puzzles (small)
 # gbrainy Removed for space - only game that pulls in mono
 mirrormagic
 pipenightdreams
 pipepanic
 pychess
 rocksndiamonds
 vodovod
 # card games
 PySolFC
 # educational/simulation
 #celestia - not currently building
 planets
 tuxpaint
 tuxpaint-stamps
 tuxtype2
 # kde based games
 taxipilot
 # compilations (we are avoiding compilations, rare exceptions)
 bsd-games
 # utilities
 games-menus
 # Nothing should be downloading data to play.
 -autodownloader
 %end
--- a/fedora-live-i3.ks
+++ b/fedora-live-i3.ks
@ -1,30 +0,0 @@
 # fedora-livecd-i3.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager i3
 #
 # Maintainer(s):
 # - Nasir Hussain    <nasirhm@fedoraproject.org>
 # - Eduard Lucena    <x3mboy@fedoraproject.org>
 # - Dan Cermak       <defolos@tummy.com>
 # - Justin W. Flory  <jwf@fedoraproject.org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-i3-common.ks
 %post
 # i3 configuration
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/i3
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-jam-kde.ks
+++ b/fedora-live-jam-kde.ks
@ -0,0 +1,222 @@
 #fedora-livedvd-jam-kde.ks
 # With KDE Desktop
 # Fedora Jam: For Musicians and audio enthusiasts
 # Fedora Jam is a spin for anyone interested in creating 
 # music 
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 # Maintainer: Jørn Lomax <northlomax@gmail.com>
 #             https://fedoraproject.org/wiki/User:jvlomax
 #             Brendan Jones <brendan.jones.it@gmail.com>
 %include fedora-livecd-kde.ks
 # DVD size partition
 part / --size 10240 --fstype ext4
 #enable threaded irqs
 bootloader --append="threadirqs"
 %packages
 #alsa
 alsa-firmware
 alsa-tools
 alsa-utils
 alsamixergui
 alsa-plugins-jack
 alsa-plugins-pulseaudio
 alsa-plugins-usbstream
 alsa-plugins-samplerate
 alsa-plugins-upmix
 alsa-plugins-vdownmix
 a2jmidid
 aj-snapshot
 #jack 
 jack-audio-connection-kit
 jack-audio-connection-kit-dbus
 qjackctl
 jackctlmmc
 #pulse
 pulseaudio-module-jack
 pavucontrol
 #midi
 qsynth
 fluidsynth
 fluid-soundfont-gm
 fluidsynth-dssi
 timidity++
 qmidiarp
 vmpk
 harmonyseq
 #synthesis
 hydrogen
 bristol
 monobristol
 zynaddsubfx
 yoshimi
 swami
 Add64
 synthv1
 samplv1
 drumkv1
 ams
 #guitar
 rakarrack
 guitarix
 tuxguitar
 sooperlooper
 #recodring and DAW
 audacity
 ardour3
 rosegarden4
 seq24
 muse
 qtractor
 non-session-manager
 non-daw
 non-sequencer
 non-mixer
 # audio-plugins
 calf
 dssi
 jack-rack
 ladspa
 #ladpsa plugins
 ladspa-amb-plugins
 ladspa-autotalent-plugins
 ladspa-blop-plugins
 ladspa-cmt-plugins
 ladspa-fil-plugins
 ladspa-mcp-plugins
 ladspa-rev-plugins
 ladspa-swh-plugins
 ladspa-tap-plugins
 ladspa-vco-plugins
 #lv2 plugins
 lv2
 lv2-avw-plugins
 lv2-fil-plugins
 lv2-invada-plugins
 lv2-kn0ck0ut
 lv2-ll-plugins
 lv2-swh-plugins
 lv2-vocoder-plugins
 lv2-zynadd-plugins
 lv2dynparam
 lv2-abGate
 lv2-c++-tools 
 lv2-samplv1
 lv2-synthv1
 lv2-drumkv1
 lv2-triceratops
 lv2-newtonator
 lv2-x42-plugins
 lv2-fomp-plugins
 lv2-sorcer
 lv2-fabla
 lv2-artyfx-plugins
 #dssi
 nekobee-dssi
 whysynth-dssi
 xsynth-dssi
 hexter-dssi
 zynjacku 
 zita-at1
 zita-rev1
 #sound analasys, none of these are packaged yet
 #praat bug_id=666656
 #friture
 #writing & publishing
 emacs
 emacs-color-theme
 vim
 nano
 mscore
 lilypond
 frescobaldi
 mup
 #audio utilities
 jamin
 lash
 jack_capture
 jaaa
 jmeters
 qastools
 arpage
 realTimeConfigQuickScan
 rtirq
 #patchage
 #ladish #not packaged yet
 japa
 radium-compressor
 #streaming
 idjc
 # fedora jam theming (to be customized)
 kfaenza-icon-theme
 fedora-jam-backgrounds
 fedora-jam-kde-theme
 #Misc. Utils
 screen
 shutter
 -ksnapshot
 multimedia-menus
 kernel-tools
 #Include Mozilla Firefox and Thunderbird
 firefox
 thunderbird
 #remove packages not need
 #-kdesdk-umbrello
 #-kdesdk-kcachegrindy
 #-kdesdk-kompare
 #-kdepim
 %end
 %post
 #setup kickoff favorites
 /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/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/.kde/share/config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 EOF
 # Override fedora-live-kde-base.ks settings
 sed -i /etc/rc.d/init.d/livesys -res"#^(FavoriteURLs=).*#\1${JAMFAVORITESLIVE}#"
 cat >> /etc/rc.d/init.d/livesys << EOF
 /usr/sbin/usermod -a -G jackuser,audio liveuser
 EOF
 %end
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@ -1,85 +0,0 @@
 #fedora-livedvd-jam-kde.ks
 # With KDE Desktop
 # Fedora Jam: For Musicians and audio enthusiasts
 # Fedora Jam is a spin for anyone interested in creating 
 # music 
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 # Maintainer: JT Pennington (q5sys) <jt@obs-sec.com>
 %include fedora-live-kde.ks
 # DVD size partition
 part / --size 10240 --fstype ext4
 #enable threaded irqs
 bootloader --append="threadirqs"
 %packages
@audio
 #pipewire
 pipewire
 #sound analasys, none of these are packaged yet
 #praat bug_id=666656
 #friture
 #writing & publishing
 emacs
 emacs-color-theme
 vim
 nano
 #audio utilities
 # fedora jam theming (to be customized)
 fedora-jam-backgrounds
 fedora-jam-kde-theme
 #Misc. Utils
 screen
 multimedia-menus
 kernel-tools
 #Include Mozilla Firefox and Thunderbird
 firefox
 thunderbird
 #remove packages not needed
 -akregator
 -kaddressbook
 -kmail
 -kontact
 -korganizer
 -non-mixer
 -non-session-manager
 -non-sequencer
 %end
 %post
 # Override livesys-kde settings
 cat >> /var/lib/livesys/livesys-session-extra << EOF
 #setup kickoff favorites
 /bin/mkdir -p /etc/skel/.config
 JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/studio-controls.desktop,/usr/share/applications/ardour6.desktop,/usr/share/applications/carla.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 cat <<FOE  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
 FOE
 /usr/sbin/usermod -a -G jackuser,audio liveuser
 EOF
 %end
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@ -3,23 +3,118 @@
 # mailto:kde@lists.fedoraproject.org
 %include fedora-live-base.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks
 %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
-# set livesys session type
+# add initscript
-sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
 if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
    # use image also for kdm
    mkdir -p /usr/share/apps/kdm/faces
    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
 fi
 # make liveuser use KDE
 echo "startkde" > /home/liveuser/.xsession
 chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 # set up autologin for user liveuser
 sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
 sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
 # set up user liveuser as default user and preselected user
 sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
 sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/
 cat > /home/liveuser/.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
 # show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 # chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
 chmod +x /usr/share/applications/liveinst.desktop
 # copy over the icons for liveinst to hicolor
 cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
 cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
 cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
 cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
 cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
 cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
 touch /usr/share/icons/hicolor/
 # Set akonadi backend
 mkdir -p /home/liveuser/.config/akonadi
 cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 [%General]
 Driver=QSQLITE3
 AKONADI_EOF
 # Disable the update notifications of apper 
 cat > /home/liveuser/.kde/share/config/apper << APPER_EOF
 [CheckUpdate]
 autoUpdate=0
 distroUpgrade=0
 interval=0
 APPER_EOF
 # Disable some kded modules
 # apperd: http://bugzilla.redhat.com/948099
 cat > /home/liveuser/.kde/share/config/kdedrc << KDEDRC_EOF
 [Module-apperd]
 autoload=false
 KDEDRC_EOF
 # Disable kres-migrator
 cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
 [Migration]
 Enabled=false
 KRES_EOF
 # Disable nepomuk
 cat > /home/liveuser/.kde/share/config/nepomukserverrc << NEPOMUK_EOF
 [Basic Settings]
 Start Nepomuk=false
 [Service-nepomukfileindexer]
 autostart=false
 NEPOMUK_EOF
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 # small hack to enable plasma-netbook workspace on boot
 if strstr "\`cat /proc/cmdline\`" netbook ; then
   mv /usr/share/autostart/plasma-desktop.desktop /usr/share/autostart/plasma-netbook.desktop
   sed -i 's/desktop/netbook/g' /usr/share/autostart/plasma-netbook.desktop
 fi
 EOF
 %end
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@ -1,7 +1,8 @@
-# fedora-livecd-kde.ks
+# fedora-live-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
 #   see fedora-livecd-kde.ks for the default 1 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@ -11,7 +12,58 @@
 %include fedora-live-minimization.ks
 # DVD payload
-part / --size=8000
+part / --size=8192
 %packages
 # ship KDE wallpapers instead of GNOME ones
 -desktop-backgrounds-basic
 kde-wallpapers
 # Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
 calligra
 #kdeartwork			# only include some parts of kdeartwork
 #twinkle			# (~10 megs)
 fuse
 liveusb-creator
 #pavucontrol			# pavucontrol has duplicate functionality with kmix
 krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 # kdeedu apps
 blinken
 kalzium
 kanagram
 kgeography
 khangman
 kiten
 klettres
 ktouch
 kturtle
 kwordquiz
 parley
 step
 marble
 kstars
 kalgebra
 kbruch
 kig
 kmplot
 rocs
 cantor
 # Cantor backends
 cantor-R		# Cantor R backend, built against R-core at compile time
 maxima			# runtime dependency of the Cantor Maxima backend
 octave			# runtime dependency of the Cantor Octave backend
 # KDE 4 translations
 kde-l10n-*
 calligra-l10n-*
 ## avoid serious bugs by omitting broken stuff
 %end
 %post
 %end
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@ -1,26 +0,0 @@
 # fedora-livecd-lxde.ks
 #
 # Description:
 # - Fedora Live Spin with the light-weight LXDE Desktop Environment
 #
 # Maintainer(s):
 # - Christoph Wickert <cwickert@fedoraproject.org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-lxde-common.ks
 %post
 # LXDE and LXDM configuration
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/startlxde
 DISPLAYMANAGER=/usr/sbin/lxdm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="lxde"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@ -1,23 +0,0 @@
 # fedora-live-lxqt.ks
 #
 # Description:
 # – Fedora Live Spin with the LXQt desktop environment
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
 #
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-lxqt-common.ks
 %packages
 dracut-config-generic
 %end
 %post
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="lxqt"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-mate-compiz.ks
+++ b/fedora-live-mate-compiz.ks
@ -0,0 +1,44 @@
 # 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
 part / --size 4096 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
 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
 # 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 MATE as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf
 # Turn off PackageKit-command-not-found while uninstalled
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/
 EOF
 %end
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@ -1,16 +0,0 @@
 # Desktop with customizations to fit in a CD (package removals, etc.)
 # Maintained by the Fedora Desktop SIG:
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 %include fedora-live-base.ks
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 part / --size 8192
 %post
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@ -4,6 +4,25 @@
 %packages
 # save some space
 -mpage
 -sox
 -hplip
 -hpijs
 -numactl
 -isdn4k-utils
 -autofs
 # smartcards won't really work on the livecd.
 -coolkey
 -wget
 # qlogic firmwares
 -ql2100-firmware
 -ql2200-firmware
 -ql23xx-firmware
 # scanning takes quite a bit of space :/
 -xsane
 -xsane-gimp
 -sane-backends
 %end
--- a/fedora-live-python-classroom.ks
+++ b/fedora-live-python-classroom.ks
@ -1,11 +0,0 @@
 # Maintained by the Fedora Python SIG:
 # http://fedoraproject.org/wiki/SIGs/Python
 # mailto:python-devel@lists.fedoraproject.org
 # The Workstion based Python Classroom Lab
 %include fedora-live-workstation.ks
 %include fedora-python-classroom-gnome-common.ks
 # https://bugzilla.redhat.com/show_bug.cgi?id=1695796
 part / --size 8192
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@ -1,20 +0,0 @@
 # Fedora Scientific with KDE Desktop
 # Fedora Scientific: For researchers in Science and Engineering
 # Fedora-Scientific aims to create a Fedora which has the generic
 # toolset for the researcher
 # Web: https://labs.fedoraproject.org/en/scientific/
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 %include fedora-scientific-common.ks
 # The recommended part size for DVDs is too close to use for the scientific spin
 part / --size 15000
 %post
 %end
--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@ -1,108 +0,0 @@
 # Filename:
 #   fedora-livecd-security.ks
 # Description:
 #   A fully functional live OS based on Fedora for use in security auditing, 
 #   forensics research, and penetration testing.
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
 #   JT Pennington <jt [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
 #   many thanks, especially to Christoph Wickert!
 #   Fedora LXDE Spin - Copied over stuff to make LXDE Default
 #   Luke Macken and Adam Miller for the original OpenBox Security ks and all
 #   the Security Applications! 
 #   Hiemanshu Sharma <hiemanshu [AT] fedoraproject <dot> org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 # spin was failing to compose due to lack of space, so bumping the size.
 part / --size 10240
 %packages
 # install env-group to resolve RhBug:1891500
@^xfce-desktop-environment
@xfce-apps
 # Security tools
@security-lab
 security-menus
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
 # save some space
 -autofs
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
 -PackageKit*                # we switched to dnfdragora, 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-rootpassword
 -policycoreutils-gui
 # exclude some packages to save some space
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
 -aide
 -binwalk
 -bkhive
 -bonesi
 -bro
 -cmospwd
 -dnstop
 -etherape
 -hfsutils
 -httpie
 -httrack
 -hydra
 -kismon
 -labrea
 -nebula
 -netsed
 -onesixtyone
 -packETH
 -pads
 -pdfcrack
 -proxychains
 -pyrit
 -raddump
 -rkhunter
 -safecopy
 -samdump2
 -scalpel
 -sslstrip
 -tcpreen
 -tcpreplay
 -tripwire
 -wipe
 -zmap
 %end
 %post
 # xfce configuration
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@ -1,19 +0,0 @@
 # fedora-livecd-soas.ks
 #
 # Description:
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
 # - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
 # - Alex Perez <aperez AT alexperez DOT com>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-soas-common.ks
 %post
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-sway.ks
+++ b/fedora-live-sway.ks
@ -1,32 +0,0 @@
 # fedora-livecd-sway.ks
 #
 # Description:
 # - Fedora Live Spin with the tiling window manager Sway
 #
 # Maintainer(s):
 # - Aleksei Bavshin         <alebastr89@gmail.com>
 # - Jiří Konečný            <jkonecny@redhat.com>
 # - Anthony Rabbito         <hello@anthonyrabbito.com>
 # - Fabio Alessandro Locati <me@fale.io>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-sway-common.ks
 %packages
 # To be able to show installation instructions on background
 nwg-wrapper
 %end
 %post
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/sway
 DISPLAYMANAGER=/bin/sddm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="sway"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@ -1,20 +0,0 @@
 # Maintained by the Fedora Workstation WG:
 # http://fedoraproject.org/wiki/Workstation
 # mailto:desktop@lists.fedoraproject.org
 %include fedora-live-base.ks
 %include fedora-workstation-common.ks
 #
 # Disable this for now as packagekit is causing compose failures
 # by leaving a gpg-agent around holding /dev/null open.
 #
 #include snippets/packagekit-cached-metadata.ks
 part / --size 7750
 %post
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
 %end
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@ -1,33 +0,0 @@
 # fedora-livecd-xfce.ks
 #
 # Description:
 # - Fedora Live Spin with the light-weight XFCE Desktop Environment
 #
 # Maintainer(s):
 # - Rahul Sundaram    <sundaram@fedoraproject.org>
 # - Christoph Wickert <cwickert@fedoraproject.org>
 # - Kevin Fenzi       <kevin@tummy.com>
 # - Adam Miller       <maxamillion@fedoraproject.org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-xfce-common.ks
 # need a bigger /
 part / --size 6144
 %post
 # xfce configuration
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
 %end
--- a/fedora-livecd-desktop.ks
+++ b/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
--- a/fedora-livecd-kde.ks
+++ b/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
--- a/fedora-livecd-lxde.ks
+++ b/fedora-livecd-lxde.ks
@ -0,0 +1,64 @@
 # fedora-livecd-lxde.ks
 #
 # Description:
 # - Fedora Live Spin with the light-weight LXDE Desktop Environment
 #
 # Maintainer(s):
 # - Christoph Wickert <cwickert@fedoraproject.org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-lxde-packages.ks
 %post
 # LXDE and LXDM configuration
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/startlxde
 DISPLAYMANAGER=/usr/sbin/lxdm
 EOF
 cat >> /etc/rc.d/init.d/livesys << EOF
 # disable screensaver locking and make sure gamin gets started
 cat > /etc/xdg/lxsession/LXDE/autostart << FOE
 /usr/libexec/gam_server
@lxpanel --profile LXDE
@pcmanfm --desktop --profile LXDE
 /usr/libexec/notification-daemon
 FOE
 # set up preferred apps 
 cat > /etc/xdg/libfm/pref-apps.conf << FOE 
 [Preferred Applications]
 WebBrowser=firefox.desktop
 MailClient=sylpheed.desktop
 FOE
 # set up auto-login for liveuser
 sed -i 's/# autologin=.*/autologin=liveuser/g' /etc/lxdm/lxdm.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
 # create default config for clipit, otherwise it displays a dialog on startup
 mkdir -p /home/liveuser/.config/clipit
 cat > /home/liveuser/.config/clipit/clipitrc  << FOE
 [rc]
 use_copy=true
 save_uris=true
 save_history=false
 statics_show=true
 single_line=true
 FOE
 # this goes at the end after all other changes.
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-livecd-mate-compiz.ks
+++ b/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
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@ -0,0 +1,155 @@
 # Filename:
 #   fedora-livecd-security.ks
 # Description:
 #   A fully functional live OS based on Fedora for use in security auditing, 
 #   forensics research, and penetration testing.
 # 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!
 #   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! 
 #   Hiemanshu Sharma <hiemanshu [AT] fedoraproject <dot> org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 # spin was failing to compose due to lack of space, so bumping the size.
 part / --size 10240
 %packages
@xfce-desktop
@xfce-apps
 #@xfce-extra-plugins
 #@xfce-media
 #@xfce-office
 #@firefox
 # Security tools (not ready at the moment)
@security-lab
 security-menus
 # save some space
 -autofs
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
 -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
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
 -aide
 -binwalk
 -bkhive
 -bonesi
 -bro
 -cmospwd
 -dnstop
 -etherape
 -hfsutils
 -httpie
 -httrack
 -hydra
 -kismon
 -labrea
 -nebula
 -netsed
 -onesixtyone
 -packETH
 -pads
 -pdfcrack
 -picviz-gui
 -prelude-lml
 -prelude-manager
 -prewikka
 -proxychains
 -pyrit
 -raddump
 -rkhunter
 -safecopy
 -samdump2
 -scalpel
 -sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
 -tripwire
 -wipe
 %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
 PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 cat >> /etc/rc.d/init.d/livesys << EOF
 mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
 WebBrowser=midori
 FOE
 # disable screensaver locking (#674410)
 cat >> /home/liveuser/.xscreensaver << FOE
 mode:           off
 lock:           False
 dpmsEnabled:    False
 FOE
 # deactivate xfconf-migration (#683161)
 rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
 # deactivate xfce4-panel first-run dialog (#693569)
 mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
 cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 # 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 Xfce as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=xfce/' /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 (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 # this goes at the end after all other changes. 
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@ -0,0 +1,120 @@
 # fedora-livecd-soas.ks
 #
 # Description:
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Mel Chua <mchua AT fedoraproject DOT org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-soas-packages.ks
 firewall --enabled --service=mdns,presence
 %post
 # 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 10
 Fedora release 20 (Heisenbug)
 EOF
 # 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.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
 org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.sugarlabs.InfoSlicer
 org.sugarlabs.PortfolioActivity
 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
 # Don't use the default system user (in SoaS liveuser) as nick name
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
 # Disable the logout menu item in Sugar
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
 # Enable Sugar power management
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 cat >> /etc/rc.d/init.d/livesys << EOF
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set Sugar as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
 EOF
 cat >> /etc/rc.d/init.d/livesys-late << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
 lock-enabled=false
 FOE
 # and hide the lock screen option
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
 [org.gnome.desktop.lockdown]
 disable-lock-screen=true
 FOE
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 EOF
 chmod 755 /etc/rc.d/init.d/livesys-late
 /sbin/restorecon /etc/rc.d/init.d/livesys-late
 /sbin/chkconfig --add livesys-late
 %end
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@ -0,0 +1,76 @@
 # fedora-livecd-xfce.ks
 #
 # Description:
 # - Fedora Live Spin with the light-weight XFCE Desktop Environment
 #
 # Maintainer(s):
 # - Rahul Sundaram    <sundaram@fedoraproject.org>
 # - Christoph Wickert <cwickert@fedoraproject.org>
 # - Kevin Fenzi       <kevin@tummy.com>
 # - Adam Miller       <maxamillion@fedoraproject.org>
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 %include fedora-xfce-packages.ks
 %post
 # xfce configuration
 # This is a huge file and things work ok without it
 rm -f /usr/share/icons/HighContrast/icon-theme.cache
 # create /etc/sysconfig/desktop (needed for installation)
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 cat >> /etc/rc.d/init.d/livesys << EOF
 mkdir -p /home/liveuser/.config/xfce4
 cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
 MailReader=sylpheed-claws
 FileManager=Thunar
 WebBrowser=midori
 FOE
 # disable screensaver locking (#674410)
 cat >> /home/liveuser/.xscreensaver << FOE
 mode:           off
 lock:           False
 dpmsEnabled:    False
 FOE
 # deactivate xfconf-migration (#683161)
 rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
 # deactivate xfce4-panel first-run dialog (#693569)
 mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
 cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 # 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 Xfce as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=xfce/' /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 (new Xfce security feature)
 chmod +x /home/liveuser/Desktop/liveinst.desktop
 # this goes at the end after all other changes. 
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 EOF
 %end
--- a/fedora-livedvd-electronic-lab.ks
+++ b/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
--- a/fedora-livedvd-games.ks
+++ b/fedora-livedvd-games.ks
@ -0,0 +1,193 @@
 # fedora-livedvd-games.ks
 #
 # Maintainer(s):
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 %include fedora-livecd-xfce.ks
 # The recommended part size for DVDs is too close to use for the games spin
 part / --size 10240
 %packages
 # Wine pulls in i386 libraries under x86_86 making that spin too big.
 # Also the point is to show off Fedora games, not running windows games.
 -wine
 # Remove libreoffice since it just got added to livecd-desktop and
 # will likely put the games spin over size and it is freeze time.
 -libreoffice*
 # Allow joysticks and game pads to work
 joystick-support
 # games
 # traditional (big)
 #alienarena #Cut for size
 armacycles-ad
 asc
 asc-music
 astromenace
 beneath-a-steel-sky-cd
 boswars
 btanks
 bzflag
 crossfire-client
 extremetuxracer
 flight-of-the-amazon-queen-cd
 freeciv
 freecol
 freedoom
 freedroidrpg
 frozen-bubble
 gl-117
 glob2
 lincity-ng
 tmw
 maniadrive
 maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
 neverball
 nogravity
 pinball
 scorched3d
 supertux
 supertuxkart
 ultimatestunts
 warzone2100
 wesnoth
 worminator
 warmux
 xmoto
 # traditional (small)
 abe
 alex4
 ballz
 blobwars
 bombardier
 cdogs-sdl
 clanbomber
 colossus
 foobillard
 glaxium
 gnubg
 gnugo
 haxima
 hedgewars
 kcheckers
 knights
 lbrickbuster2
 liquidwar
 londonlaw
 lordsawar
 lure
 machineball
 nethack
 pachi
 pioneers
 quarry
 Ri-li
 rogue
 scorchwentbonkers
 seahorse-adventures
 solarwolf
 sopwith
 stormbaancoureur
 ularn
 xblast
 # arcade classics(ish) (big)
 auriferous
 alienblaster
 duel3
 lmarbles
 powermanga
 raidem
 raidem-music
 trackballs
 trackballs-music
 # arcade classics(ish) (small)
 ballbuster
 CriticalMass
 dd2
 KoboDeluxe
 lacewing
 Maelstrom
 methane
 njam
 seahorse-adventures
 shippy
 tecnoballz
 wordwarvi
 xgalaxy
 zasx
 # falling blocks games (small) 
 amoebax
 crack-attack
 crystal-stacker
 gemdropx
 gweled
 # puzzles (big)
 enigma
 fillets-ng
 pingus
 # puzzles (small)
 escape
 magicor
 mirrormagic
 pipenightdreams
 pipepanic
 pychess
 rocksndiamonds
 vodovod
 # card games
 #poker2d - dropped from F14 for being orphaned
 PySolFC
 # educational/simulation
 bygfoot
 celestia
 childsplay
 gcompris
 planets
 stellarium
 tuxpaint
 tuxpaint-stamps
 tuxtype2
 # kde based games
 taxipilot
 # utilities
 games-menus
 # Note some stuff I don't want pulled into the games spin.
 # No compilations of games as I want to only include games that at least
 # someone thought were good within a genre.
 -kdegames
 # Nothing should be downloading data to play.
 -autodownloader
 %end
--- a/fedora-livedvd-robotics.ks
+++ b/fedora-livedvd-robotics.ks
@ -1,18 +1,16 @@
-# Maintained by x3mboy and the Fedora Robotics SIG:
+# Maintained by the Fedora Robotics SIG:
-# https://fedoraproject.org/wiki/SIGs/Robotics
+# http://fedoraproject.org/wiki/SIGs/Robotics
 # mailto:x3mboy@fedoraproject.org
 # mailto:robotics@lists.fedoraproject.org
 %include fedora-live-base.ks
 %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
-# Install workstation-product-environment to resolve RhBug:1891500
+@gnome-desktop
@^workstation-product-environment
 # Add robotics development packages
@robotics-suite
@ -29,13 +27,9 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
-@dial-up
+
-@input-methods
+# Add a web browser
-@standard
+firefox
 -@container-management
 -@libreoffice
 -@networkmanager-submodules
 -@workstation-product
 # Remove office suite
 -libreoffice-*
@ -47,14 +41,13 @@ mercurial
 # Drop things that pull in perl
 -linux-atm
-# No printing or scanning
+# No printing
 -foomatic-db-ppds
 -foomatic
 -sane-backends-drivers-scanners
 -libsane-hpaio
 # Dictionaries are big
 -aspell-*
 -hunspell-*
 -man-pages*
 -words
@ -68,6 +61,7 @@ mercurial
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
 -quota
 -nano
 -dos2unix
 -finger
@ -76,12 +70,15 @@ mercurial
 -mtr
 -pinfo
 -rsh
 -nfs-utils
 -ypbind
 -yp-tools
 -rpcbind
 -acpid
 -ntsysv
 # Drop some system-config things
 -system-config-boot
 -system-config-language
 -system-config-network
 -system-config-rootpassword
@ -90,9 +87,9 @@ mercurial
 %end
 # Rip the post-configuration from the live-desktop, set default shortcuts to IDEs 
 %post
-# Extend the post-configuration from the live-desktop, set default shortcuts to IDEs
+cat >> /etc/rc.d/init.d/livesys << EOF
 cat >> /var/lib/livesys/livesys-session-extra << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
@ -105,6 +102,12 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override <
 disable-lock-screen=true
 FOE
 # disable updates plugin
 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
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
@ -114,7 +117,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', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE
 fi
@ -122,5 +125,17 @@ fi
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 # set up auto-login
 cat > /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
 AutomaticLogin=liveuser
 FOE
 # Turn off PackageKit-command-not-found while uninstalled
 if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
 fi
 EOF
 %end
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@ -1,15 +1,34 @@
 #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://fedoraproject.org/wiki/Scientific_Spin
 # Web: http://spins.fedoraproject.org/scientific-kde/
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 %include fedora-live-kde.ks
 # The recommended part size for DVDs is too close to use for the scientific spin
 part / --size 12288
 %packages
 # Installing the default/mandatory packages from engineering & scientific
@engineering-and-scientific
 # scilab
-## scilab
+scilab
-## scilab-devel
+scilab-devel
-## scilab-doc
+scilab-doc
-# Remove sagemath explicitly?
+# sagemath
-sagemath
+# BZ #1006230 should fix this
 sagemath
 sagemath-notebook
 #Devel tools
@ -28,22 +47,27 @@ armadillo-devel
 ddd
 valgrind
 #python 2 tools/libraries not included from the groups
 python-ipython
 python-ipython-console
 python-ipython-notebook
 sympy
 python-networkx
 #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
-python3-matplotlib-qt5
+python-matplotlib-qt4
 python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-tk
 # Include Java development tools
@ -56,14 +80,12 @@ gcc-gfortran
 # GUI for R
 rkward
-# julia
+# GUI for Octave
-julia
+qtoctave
 julia-doc
 julia-devel
 python3-spyder
 python3-spyder-kernels
 # IDEs for the IDE folks
@eclipse
 spyder
 #writing & publishing
 emacs
@ -83,9 +105,12 @@ pdfshuffler
 openmpi
 openmpi-devel
 valgrind-openmpi
 pvm
 pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
 mpi4py-openmpi
 python3-mpi4py-openmpi
 python3-mpi4py-mpich
 #Version control- a GUI for each as well
@ -107,6 +132,7 @@ libotf
 #root
 root
 root-gui-fitpanel
 root-python
 #Multiple jobs/clustering system
 # torque
@ -122,20 +148,26 @@ dia
 inkscape
 xzgv
 gimp
-## ggobi
+ggobi
-## ggobi-devel
+ggobi-devel
-#g3data
+g3data
-#Mayavi
+Mayavi
 #Misc. Utils
 screen
 tmux
 rlwrap
 hexchat
 shutter
 fig2ps
 bibtex2html
 hevea
 #Include Mozilla Firefox
 firefox
 %end
 %post
 %end
--- a/fedora-lxde-packages.ks
+++ b/fedora-lxde-packages.ks
@ -8,9 +8,7 @@
 %packages
 ### LXDE desktop
-# install env-group to resolve RhBug:1891500
+@lxde-desktop
@^lxde-desktop-environment
@lxde-apps
@lxde-media
@lxde-office
@ -40,12 +38,12 @@ metacity
 #-words
 # save some space
 -@admin-tools
 -autofs
 -acpid
 -gimp-help
 -desktop-backgrounds-basic
-PackageKit*                # we switched to dnfdragora, so we don't need this
+-realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
@ -54,6 +52,7 @@ metacity
 #-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
 # drop some system-config things
 -system-config-boot
 #-system-config-language
 -system-config-network
 -system-config-rootpassword
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@ -1,59 +0,0 @@
 # fedora-lxqt-common.ks
 #
 # Description:
 # – Fedora Live Spin with the LXQt desktop environment
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
 # – Zamir SUN <zsun@fedoraproject.org>
 #
 %packages
 # install env-group to resolve RhBug:1891500
@^lxqt-desktop-environment
@lxqt-apps
@lxqt-media
 # for nm applet
 gnome-keyring
 # l10n
@lxqt-l10n
 lximage-qt-l10n
 obconf-qt-l10n
 pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 # Text Editor
 enki
 # remove unneeded stuff to get a lightweight system
 # fonts (we make no bones about admitting we're english-only)
 wqy-microhei-fonts          # a compact CJK font, to replace:
 -naver-nanum-gothic-fonts       # Korean
 -vlgothic-fonts             # Japanese
 -adobe-source-han-sans-cn-fonts     # simplified Chinese
 -adobe-source-han-sans-tw-fonts     # traditional Chinese
 -pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
 #-stix-fonts        # mathematical symbols
 # remove input methods to free space
 -@input-methods
 -@admin-tools
 -scim*
 -m17n*
 # Temporary include ibus to workaround RHBZ 1633225
 # -ibus*
 -iok
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132
 # Why is this not pulled in by anaconda???
 storaged
 %end
--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@ -1,59 +0,0 @@
 %packages
 # install env-group to resolve RhBug:1891500
@^mate-desktop-environment
 fedora-release-matecompiz
 compiz
 compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
 compiz-plugins-experimental
 libcompizconfig
 compiz-plugins-main
 ccsm
 simple-ccsm
 emerald-themes
 emerald
 fusion-icon
 # blacklist applications which breaks mate-desktop
 -audacious
 # see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
 # and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
 # use earlyoom instead of systemd-oomd-defaults
 earlyoom
 -systemd-oomd-defaults
 # office
@libreoffice
 # dsl tools
 rp-pppoe
 # FIXME; apparently the glibc maintainers dislike this, but it got put into the
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
 # Drop things for size
 -@3d-printing
 -@admin-tools
 -brasero
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic
 -gnome-logs
 -gnome-software
 -gnome-user-docs
 -@mate-applications
 # Help and art can be big, too
 -gnome-user-docs
 -evolution-help
 # Legacy cmdline things we don't want
 -telnet
 %end
--- a/fedora-mate-packages.ks
+++ b/fedora-mate-packages.ks
@ -0,0 +1,29 @@
 %packages
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 firefox
@mate
 compiz
 compiz-plugins-main
 compiz-plugins-extra
 compiz-manager
 compizconfig-python
 compiz-plugins-unsupported
 compiz-bcop
 compiz-mate
 libcompizconfig
 compiz-plugins-main
 ccsm
 emerald-themes
 emerald
 fusion-icon
 fusion-icon-gtk
@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
 %end
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@ -1,24 +0,0 @@
 %packages
 microdnf
 -@standard
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
 # recommended by iproute, we don't want it in minimal
 -iproute-tc
 # recommended by gnutls, we don't want it in minimal
 -trousers
 glibc-langpack-en
 iw
 NetworkManager-wifi
 %end
 %post
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
 rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 %end
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@ -1,82 +0,0 @@
 text
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 selinux --enforcing
 # Disabled for modular compose (for now)
 #firewall --enabled --service=mdns
 # Disabled for modular compose (for now)
 #services --enabled=sshd,chronyd,initial-setup
 services --enabled=NetworkManager
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
 bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 zerombr
 clearpart --all --initlabel --disklabel=msdos
 autopart --type=plain
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 %include fedora-repo.ks
 %packages --excludedocs --excludeWeakdeps --nocore
 bash
 fedora-modular-release
 filesystem
 coreutils-single
 util-linux
 rpm
 shadow-utils
 microdnf
 glibc-minimal-langpack
 grubby
 kernel
 sssd-client
@networkmanager-submodules
 -fedora-logos
 -coreutils
 -dosfstools
 -e2fsprogs
 -fuse-libs
 -gnupg2-smime
 -libss # used by e2fsprogs
 -libusbx
 -pinentry
 -shared-mime-info
 -trousers
 -xkeyboard-config
 -dracut
 %end
 %post
 # Find the architecture we are on
 arch=$(uname -m)
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]]; then
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 fi
 releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # 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
 # Disable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
 /sbin/chkconfig network off
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 %end
--- a/fedora-neuro-gnome-common.ks
+++ b/fedora-neuro-gnome-common.ks
@ -1,30 +0,0 @@
 # Description: Common gnome based configuration for NeuroFedora spin images.
 #
 # Maintained by the NeuroFedora SIG:
 # https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org
 # Please specify the individual package sets in their own ks files:
 # - fedora-comp-neuro-common.ks
 %packages
@firefox
 # Editors
 emacs
 vim-X11
 # This is no longer workstation
 -@workstation-product
 # No Workstation backgrounds
 #-desktop-backgrounds-basic
 #-*backgrounds-extras
 %end
 %post
 #Override the favorite desktop application in Dash
 sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
 %end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christoph Wickert	93227e4c16	Drop mtpaint exclusion, already in comps	2013-12-04 16:01:54 +01:00
Christoph Wickert	8d089260b2	LXDE: Switch from firefox to midori	2013-12-04 16:01:40 +01:00
Christoph Wickert	9122e0d384	LXDE: Drop ssmtp, we no longer have a smtpd in the default install	2013-12-04 16:01:25 +01:00
Rex Dieter	07998a94aa	kde: sddm -> kdm switch here (too) hopefully temporary, so tc spins dont have to wait on comps changes	2013-11-26 13:37:01 -06:00
Rex Dieter	eda86d50a4	Revert "fedora-live-kde-base.ks: fix #1003619 (SDDM autologin)" This reverts commit `f573b2905b`.	2013-11-26 10:20:47 -06:00
Rex Dieter	8e60e7d480	Revert "kde: SDDM doesn't start (#1015048 )" This reverts commit `d94cd77007`.	2013-11-26 10:20:45 -06:00
Luya Tshimbalanga	bba9b95b64	design: comment OEF line	2013-11-25 14:55:21 -08:00
Luya Tshimbalanga	d78446b58c	design: remove incomplete git merge trace, comment inkscape tutorial and use list of tutorials instead	2013-11-25 11:06:28 -08:00
Luya Tshimbalanga	7d61f0ac6e	design: add tutorials and gimp-paint-studio	2013-11-22 13:57:58 -08:00
Luya Tshimbalanga	2c0b103fef	design: add tutorials and gimp-paint-studio	2013-11-22 13:56:37 -08:00
Brendan Jones	c125e408da	Jam: replace ardour with ardour3	2013-11-21 07:45:49 +01:00
Brendan Jones	c2e7a402bf	Jam: add openAv LV2 plugins	2013-11-19 14:30:27 +01:00
Brendan Jones	b2f1a8e9dd	Revert "Jam: Remove aj-snapshot until stable" This reverts commit `9288235085`.	2013-11-19 14:22:49 +01:00
Luya Tshimbalanga	02905f6946	Merge branch 'f20' of ssh://git.fedorahosted.org/git/spin-kickstarts into f20 design: added gimp-gap	2013-11-17 11:53:36 -08:00
Luya Tshimbalanga	eb8823e1d7	design: added gimp-gap	2013-11-17 11:52:53 -08:00
Peter Robinson	265950301c	SoaS: add back Write	2013-11-17 19:43:59 +00:00
Peter Robinson	85c65cf1c9	SoaS: update release details	2013-11-17 19:28:03 +00:00
Brendan Jones	9288235085	Jam: Remove aj-snapshot until stable	2013-11-04 22:08:14 +01:00
Dennis Gilmore	a26624ed9b	making cloud images is easier if we include the base	2013-11-01 16:48:21 -05:00
Dennis Gilmore	50d56638a4	we should no be able to exclude gimp-help Revert "this breaks compose, need to revert" This reverts commit `d6a2350a39`.	2013-10-31 14:32:34 -05:00
Kevin Kofler	f111c49a16	fedora-live*-kde.ks: Completely remove references to kaffeine. They were already commented out. Now that kaffeine is gone from Fedora, they are not going to come back.	2013-10-27 00:32:45 +02:00
Dennis Gilmore	75b3a92964	add cloud image kickstarts, pulled from the cloud-kickstart repo, we have different snippets per arch because they need different kernels	2013-10-26 08:41:43 -05:00
Brendan Jones	c69f0a4e2d	Jam: add new lv2 plugins, aj-snapshot	2013-10-24 07:48:37 +02:00
Peter Robinson	47b27db344	SoaS: drop write for the moment	2013-10-23 20:07:24 +01:00
Peter Robinson	8db08b9dc9	SoaS: add FotoToon	2013-10-23 17:36:06 +01:00
Adam Williamson	1021a05fd1	fix and simplify setting of firefox homepage in qa-test-day.ks	2013-10-22 09:14:47 -07:00
Bruno Wolff III	dcebd2c540	Use git version to get version name Using git version is simpler as it handles oddball cases internally. Since we have been using mostly lightweight tags I have set it to search those in addition to annotated tags for the best match. The output for commits that don't have a tag seems a bit nicer as well. Conflicts: Makefile	2013-10-18 15:17:25 -05:00
Dennis Gilmore	d22816d5ff	install dracut-config-generic on arm images to get a generic initramfs remove it in %post so updates get host only initramfs's	2013-10-16 21:58:04 -05:00
Kalev Lember	9b3251521f	Adapt for changed rpm gpg key names	2013-10-17 00:15:15 +02:00
Luya Tshimbalanga	41cdac9e94	fixed icon access for tutorials	2013-10-15 23:15:55 -07:00
Dennis Gilmore	d6a2350a39	this breaks compose, need to revert Revert "Drop gimp-help, b/c it's huge. (#1000891)" This reverts commit `779c417bcd`.	2013-10-13 23:20:55 -05:00
Matthias Clasen	aac93c046a	Desktop: drop prelink We're still oversize, and prelink is generally unloved.	2013-10-08 12:59:14 -04:00
Matthias Clasen	aeb2bf2034	desktop: drop gnome-boxes and gnome-dictionary We're oversize, and we have a nice application installer now. Having boxes no the spin causes some problems wrt to network configuration, anyway.	2013-10-08 12:55:42 -04:00
Rex Dieter	d94cd77007	kde: SDDM doesn't start (#1015048 )	2013-10-03 10:07:12 -05:00
Bill Nottingham	779c417bcd	Drop gimp-help, b/c it's huge. (#1000891 )	2013-10-03 10:50:26 -04:00
Amit Saha	c8dc4f13f5	Scientific: Increase install root size	2013-10-03 16:24:59 +10:00
Fabian Affolter	8011bf222f	increse part size same as in f21	2013-10-01 23:33:46 +02:00
Fabian Affolter	4ab5d14b10	remove more pkgs	2013-10-01 23:30:58 +02:00
Peter Robinson	37589abe3d	Merge branch 'f20' of ssh://git.fedorahosted.org/git/spin-kickstarts into f20	2013-09-25 01:08:48 +01:00
Peter Robinson	59142fcc92	SoaS: add lightdm as it's not pulled in by lightdm-gtk anymore it seems	2013-09-25 01:08:04 +01:00
Luya Tshimbalanga	e4975f4c09	design: fix link for tutorials Conflicts: fedora-live-design-suite.ks	2013-09-17 11:34:53 -07:00
Fabian Affolter	77f0bcbfd2	remove more pkgs to save space	2013-09-16 22:19:29 +02:00
Shakthi Kannan	02b55984ec	Increase FEL DVD payload size to 10240	2013-09-16 06:07:44 +05:30
Amit Saha	a29472b8c8	Scientific: Increase the part size	2013-09-12 17:28:23 +10:00
Kevin Fenzi	b6b2f1c8b1	Drop kbluetooth and rdesktop for now from e-lab to get things testable.	2013-09-11 09:48:23 -06:00
Amit Saha	f110c70651	Scientific: Add back sagemath. Fix: https://bugzilla.redhat.com/show_bug.cgi?id=1006230	2013-09-11 11:41:39 +10:00
Luya Tshimbalanga	359cf00301	design: temporarily remove rdesktop	2013-09-10 16:05:46 -07:00
Amit Saha	84f578fcfc	Scientific: including sage fails depcheck for no clear reason	2013-09-10 13:02:05 +10:00
Amit Saha	9d08686776	Scientific: Add sagemath	2013-09-09 09:39:57 +10:00
Amit Saha	a60ccfaea5	Scientific: firefox deps are now fixed	2013-09-06 15:21:31 +10:00
Peter Robinson	b8706aa425	SoaS: add lightdm-gtk	2013-09-05 23:23:33 +01:00
Peter Robinson	060a19dc48	update sugar	2013-09-05 23:18:41 +01:00
Amit Saha	3b11ed5a50	Scientific: Remove matplotlib's wx backend	2013-09-06 08:12:23 +10:00
Matthias Clasen	1afc133c89	desktop: we don't need uboot-tools on the desktop spin	2013-09-05 17:44:44 -04:00
Amit Saha	9a220d6fa2	Scientific: Add Python 3 packages. Disabling torque for now.	2013-09-05 17:06:11 +10:00
Brendan Jones	f0b7758285	Jam: add new non-* packages	2013-09-04 06:19:07 +02:00
Amit Saha	0458ba8098	Scientific: Include additional packages Disable firefox for now.	2013-09-03 13:06:12 +10:00
Kevin Kofler	f573b2905b	fedora-live-kde-base.ks: fix #1003619 (SDDM autologin) Set SDDM rather than KDM to autologin liveuser on the KDE live image. Patch by Martin Bříza.	2013-09-02 22:47:24 +02:00
Matthias Clasen	b8dca705d6	desktop: Remove a few apps Remove apps that are being presented as 'featured' in gnome-softwared.	2013-09-02 12:55:12 -04:00
Bruno Wolff III	13a77ad28b	Add missing 'f' to updates and testing repo urls	2013-08-31 08:09:27 -05:00
Luya Tshimbalanga	96b509716f	design: fixes group	2013-08-30 11:51:02 -07:00
Dennis Gilmore	7e9439c5f0	make / bigger on KDE images	2013-08-28 20:27:31 -05:00
Adam Williamson	802966ff92	add workaround for #679486 from kparal (see comment #86 )	2013-08-28 09:29:06 -05:00
Dennis Gilmore	e10a135b4d	setup extlinux bootloader on arm images	2013-08-26 23:11:14 -05:00
Dennis Gilmore	69cd14ecc8	increase the size of the / partitions for Desktop and Mate images	2013-08-26 20:56:30 -05:00
Dennis Gilmore	3edb2534c5	target 2gb for minimal images so they can be installed into beaglebone black nand	2013-08-26 17:18:27 -05:00
Kevin Kofler	f340f0eddf	fedora-livecd-kde.ks: Bump payload size. Also update the comments at the top of fedora-live-kde.ks and fedora-livecd-kde.ks, it's been ages since "livecd-kde" last fit on an actual CD, the target size is 1 GiB now.	2013-08-26 16:17:54 +02:00
Adam Williamson	d356510dc3	make fedora-repo.ks consistent with the actual filename	2013-08-21 16:51:19 -07:00
Bruno Wolff III	6ac1f99024	Switch over repos for branch	2013-08-20 21:31:04 -05:00
`@ -1,4 +1,4 @@`
	`%include ../fedora-live-workstation.ks`	`%include ../fedora-livecd-desktop.ks`

	`part / --size 6000`	`part / --size 6000`