fix missing /run/lock in docker base image BZ#1343138

Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>

.sparkleshare

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

Makefile

@@ -18,8 +18,6 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
-	mkdir -p -m 755 $(DATADIR)/$(name)/snippets
-	install -m 644 snippets/* $(DATADIR)/$(name)/snippets
 
 clean:
 	rm -f $(name)-*.tar.gz

README

@@ -0,0 +1,23 @@
+The master branch is where development takes place:
+ - it may contain kickstart files that are broken, or
+ - spin concepts that are in the process of being
+   approved by the Board (trademark approval), or
+ - spin concepts that are in the process of being
+   approved by the Spins SIG
+
+The release specific branches contain spin concepts that:
+ - are approved (both by Board and Spin SIG)
+ - maintained for the remainder of the release cycle
+
+git clone ssh://git.fedorahosted.org/git/spin-kickstarts.git spin-kickstarts
+cd spin-kickstarts
+# If you need a specific branch other than master:
+git checkout BRANCHNAME
+# No tag has been added yet tag HEAD with
+git tag VERSION
+git push --tags
+make
+# Publish the released tar ball
+make publish
+# Clean up the generated files:
+make clean

README.md

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

atomic-installer/lorax-configure-repo.tmpl

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

atomic-installer/lorax-embed-repo.tmpl

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

custom/qa-test-day.ks

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

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 --passalgo=sha512
+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
+

fedora-arm-base.ks

@@ -0,0 +1,69 @@
+lang en_US.UTF-8
+#keyboard us
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+firewall --enabled --service=mdns,ssh
+
+# configure extlinux bootloader
+bootloader extlinux
+
+part /boot --size=512 --fstype ext4
+part swap --size=512 --fstype swap
+part / --size=3000 --fstype ext4
+
+# make sure that initial-setup runs and lets us do all the configuration bits
+firstboot --reconfig
+
+services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=network
+
+%include fedora-repo.ks
+
+%packages
+@core
+@standard
+@hardware-support
+@dial-up
+
+kernel
+
+dracut-config-generic
+
+chrony
+arm-boot-config
+extlinux-bootloader
+initial-setup
+initial-setup-gui
+#lets resize / on first boot
+# dracut-modules-growroot
+
+# remove this in %post
+dracut-config-generic
+
+# install uboot images
+uboot-images-armv7
+
+%end
+
+%post
+
+# work around for poor key import UI in PackageKit
+rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=armhfp
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+echo "Packages within this ARM disk image"
+rpm -qa
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# 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
+

fedora-arm-kde.ks

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

fedora-arm-lxde.ks

@@ -0,0 +1,10 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-lxde-packages.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end

fedora-arm-mate.ks

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

fedora-arm-minimal.ks

@@ -0,0 +1,27 @@
+%include fedora-arm-base.ks
+
+part /boot --size=300 --fstype ext4
+part swap --size=256 --fstype swap
+part / --size=1200 --fstype ext4
+
+%packages
+-@standard
+-@dial-up
+-initial-setup-gui
+-generic-release*
+%end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+echo -n "Enabling initial-setup text mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
+echo .
+
+%end
+

fedora-arm-server.ks

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

fedora-arm-soas.ks

@@ -0,0 +1,10 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-soas-packages.ks
+
+%post
+echo -n "Enabling initial-setup gui mode on startup"
+ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
+echo .
+
+%end

fedora-arm-workstation.ks

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

fedora-arm-xbase.ks

@@ -0,0 +1,8 @@
+%packages
+@base-x
+@fonts
+@input-methods
+@multimedia
+@printing
+%end
+

fedora-arm-xfce.ks

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

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

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

fedora-cinnamon-packages.ks

@@ -0,0 +1,28 @@
+# fedora-cinnamon-packages.ks
+#
+# Description:
+# - Fedora package set for the Cinnamon Desktop Environment
+#
+# Maintainer(s):
+# - Dan Book <grinnz@grinnz.com>
+
+%packages
+
+@networkmanager-submodules
+@cinnamon-desktop
+@libreoffice
+
+# internet and multimedia
+pidgin
+hexchat
+transmission
+parole
+
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam
+
+# save some space
+-fedora-icon-theme
+-PackageKit*                # we switched to yumex, so we don't need this
+
+%end

fedora-cloud-atomic-pxetolive.ks

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

fedora-cloud-atomic-vagrant.ks

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

fedora-cloud-atomic.ks

@@ -0,0 +1,129 @@
+# Fedora Atomic is a cloud-focused spin implementing the Project
+# Atomic patterns.  Note that this replicates the same tree which can
+# now be installed on bare metal.
+
+# This image allocates most space to an LVM-managed thin pool
+# dedicated for Docker containers, and uses docker-storage-setup to
+# dynamically resize storage on boot.
+
+text
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+rootpw --lock --iscrypted locked
+user --name=none
+
+firewall --disabled
+
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --disabled=network
+services --enabled=sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
+
+zerombr
+clearpart --all
+# Atomic differs from cloud - we want LVM
+part /boot --size=300 --fstype="ext4"
+part pv.01 --grow
+volgroup atomicos pv.01
+logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+
+# Equivalent of %include fedora-repo.ks
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host
+
+reboot
+
+%post --erroronfail
+# See https://github.com/projectatomic/rpm-ostree/issues/42
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'
+
+# older versions of livecd-tools do not follow "rootpw --lock" line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+# remove the user anaconda forces us to make
+userdel -r none
+
+# Configure docker-storage-setup to resize the partition table on boot
+# https://github.com/projectatomic/docker-storage-setup/pull/25
+echo 'GROWPART=true' > /etc/sysconfig/docker-storage-setup
+
+echo -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
+
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+PERSISTENT_DHCLIENT="yes"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# Uncomment this if you want to use cloud init but suppress the creation
+# of an "ec2-user" account. This will, in the absence of further config,
+# cause the ssh key from a metadata source to be put in the root account.
+#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
+#users: []
+#disable_root: 0
+#EOF
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/random-seed
+
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
+%end
+

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

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

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between
@@ -32,8 +32,6 @@ dnf-yum
 # 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
@@ -44,7 +42,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
 
 # Vagrant setup
 sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
 mkdir -m 0700 -p ~vagrant/.ssh
 cat > ~vagrant/.ssh/authorized_keys << EOKEYS
@@ -53,12 +51,6 @@ 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

fedora-cloud-base.ks

@@ -1,151 +1,251 @@
-# This is a basic Fedora cloud spin designed to work in OpenStack and other
+# This is a basic Fedora 21 spin designed to work in OpenStack and other
 # private cloud environments. It's configured with cloud-init so it will
 # take advantage of ec2-compatible metadata services for provisioning ssh
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
+# Note that unlike the standard F20 install, this image has /tmp on disk
+# rather than in tmpfs, since memory is usually at a premium.
+#
 # This kickstart file is designed to be used with ImageFactory (in Koji).
 #
 # To do a local build, you'll need to install ImageFactory.  See
 # http://worknotes.readthedocs.org/en/latest/cloudimages.html for some notes.
 #
 # For a TDL file, I store one here:
-# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
 # (Koji generates one internally...what we really want is Koji to publish it statically)
-#
+# 
 # Once you have imagefactory and imagefactory-plugins installed, run:
-#
-#   curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+# 
+#   curl -O https://git.fedorahosted.org/cgit/fedora-atomic.git/plain/fedora-atomic-rawhide.tdl 
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
 #   imagefactory --debug base_image --file-parameter install_script ${tempfile} fedora-atomic-rawhide.tdl
 #
 
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
+user --name=none
 
 firewall --disabled
 
-# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
-bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
-services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-# Configure for gpt with bios+uefi
-clearpart --all --initlabel --disklabel=gpt
-part prepboot  --size=4    --fstype=prepboot
-part biosboot  --size=1    --fstype=biosboot
-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
+zerombr
+clearpart --all
+part / --size 3000 --fstype ext4 --grow
 
 %include fedora-repo.ks
 
 reboot
 
-##### begin package list #############################################
-%packages --instLangs=en
+# Package list.
+# FIXME: instLangs does not work, so there's a hack below
+# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
+# FIXME: instLangs bug has been fixed but now having instLangs
+# with an arg causes no langs to get installed because of BZ1262040
+# which yields the errors in BZ1261249. For now fix by not using
+# --instLangs at all
+#%packages --instLangs=en
+%packages
 
-# Include packages for the cloud-server-environment group
+kernel-core
 @^cloud-server-environment
 
-# Don't include the kernel toplevel package since it pulls in
-# kernel-modules. We're happy for now with kernel-core.
--kernel
-kernel-core
-
-# 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.
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-# Plymouth provides a graphical boot animation. In the cloud we don't
-# need a graphical boot animation. This also means anaconda won't put
-# rhgb/quiet on kernel command line
--plymouth
+# Some things from @core we can do without in a minimal install
+-biosdevname
+# Need to also add back plymouth in order to mask failure of
+# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
+#-plymouth
+-NetworkManager
+-iprutils
+# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
+# systemd-vconsole-setup.service on boot. Comment out for now
+#-kbd
+-uboot-tools
+-kernel
 
-# 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
-# Set up legacy BIOS boot if we booted from UEFI
-grub2-install --target=i386-pc /dev/vda
-fi
+# Create grub.conf for EC2. This used to be done by appliance creator but
+# anaconda doesn't do it. And, in case appliance-creator is used, we're
+# overriding it here so that both cases get the exact same file.
+# Note that the console line is different -- that's because EC2 provides
+# different virtual hardware, and this is a convenient way to act differently
+echo -n "Creating grub.conf for pvgrub"
+rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
+mkdir /boot/grub
+echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
+for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
+  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
+  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
+  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
+  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
+  echo
+done
 
-# 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:
-#   Total download size: 97 M
-#   Installed size: 268 M
-# So far we've been fine shipping without it so let's continue.
-# More discussion about this in #1234504.
+#link grub.conf to menu.lst for ec2 to work
+echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
+ln -sf grub.conf /boot/grub/menu.lst
+ln -sf /boot/grub/grub.conf /etc/grub.conf
+
+# older versions of livecd-tools do not follow "rootpw --lock" line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+# remove the user anaconda forces us to make
+userdel -r none
+
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+# this is installed by default but we don't need it in virt
+# Commenting out the following for #1234504
+# rpm works just fine for removing this, no idea why dnf can't cope
 echo "Removing linux-firmware package."
 rpm -e linux-firmware
 
-# 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"
+# Remove firewalld; was supposed to be optional in F18+, but is pulled in
+# in install/image building.
+echo "Removing firewalld."
+# FIXME! clean_requirements_on_remove is the default with DNF, but may
+# not work when package was installed by Anaconda instead of command line.
+# Also -- check if this is still even needed with new anaconda -- disabled
+# firewall should _not_ pull in this package.
+# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+dnf -C -y erase "firewalld*"
+
+# Another one needed at install time but not after that, and it pulls
+# in some unneeded deps (like, newt and slang)
+echo "Removing authconfig."
+dnf -C -y erase authconfig
+
+# instlang hack. (Note! See bug referenced above package list)
+find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
+localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
+# this will kill a live system (since it's memory mapped) but should be safe offline
+mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+build-locale-archive
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+
+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.
+# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+DEVTIMEOUT=10
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+PERSISTENT_DHCLIENT="yes"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# Uncomment this if you want to use cloud init but suppress the creation
+# of an "ec2-user" account. This will, in the absence of further config,
+# cause the ssh key from a metadata source to be put in the root account.
+#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
+#users: []
+#disable_root: 0
+#EOF
+
 echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
+rm -f /var/lib/random-seed
+
+echo "Cleaning old dnf repodata."
+# FIXME: clear history?
+dnf clean all
+truncate -c -s 0 /var/log/dnf.log
+truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+
+
+# FIXME: is this still needed?
+echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+/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
+# For trac ticket https://fedorahosted.org/cloud/ticket/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
 
 %end
-##### end kickstart post ############################################
+

fedora-cloud-bigdata.ks

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

fedora-cloud-experimental.ks

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

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

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

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

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

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

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

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

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

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

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

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

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

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
-

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

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

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

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

fedora-docker-base.ks

@@ -0,0 +1,85 @@
+# This is a minimal Fedora install designed to serve as a Docker base image.
+#
+# To keep this image minimal it only installs English language. You need to change
+# yum configuration in order to enable other languages.
+#
+###  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file.  I store one here:
+# https://git.fedorahosted.org/cgit/fedora-atomic.git/tree/fedora-atomic-rawhide.tdl
+#
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+#
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base.ks docker
+#
+
+cmdline
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+user --name=none
+
+keyboard us
+zerombr
+clearpart --all
+part / --size 3000 --fstype ext4
+network --bootproto=dhcp --device=link --activate --onboot=on
+reboot
+
+%packages --excludedocs --instLangs=en --nocore
+bash
+fedora-release
+rootfiles
+vim-minimal
+dnf
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+sssd-client
+#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
+-kernel
+
+
+%end
+
+%post --log=/tmp/anaconda-post.log
+# Set the language rpm nodocs transaction flag persistently in the
+# image yum.conf and rpm macros
+
+# remove the user anaconda forces us to make
+userdel -r none
+
+LANG="en_US"
+echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
+
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+
+rm -f /usr/lib/locale/locale-archive
+
+#Setup locale properly
+localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
+
+rm -rf /var/cache/yum/*
+rm -f /tmp/ks-script*
+
+#Make it easier for systemd to run in Docker container
+cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
+sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
+
+#Mask mount units and getty service so that we don't get login prompt
+systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
+
+# Fix /run/lock breakage since it's not tmpfs in docker
+umount /run
+systemd-tmpfiles --create --boot
+
+rm -f /etc/machine-id
+
+%end

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

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

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

fedora-install-cloud.ks

@@ -0,0 +1,93 @@
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+# generic* would match generic-jms-ra, so don't 'simplify' this
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+# jruby used to be in this list, but springframework-context explicitly
+# requires it, not just 'any ruby implemention' - please check for things
+# on the image that require mvn(org.jruby:jruby) before adding jruby to
+# this list again - adamw 2014/09
+#-jruby
+
+# core
+kernel*
+dracut-*
+
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-cloud
+-fedora-productimg-server
+-fedora-productimg-workstation
+
+# Packages to enable server images to run in cloud environments
+@cloud-server
+@core
+@standard
+@headless-management
+@dogtag
+@directory-server
+@dns-server
+@freeipa-server
+@ftp-server
+@guest-agents
+@ha
+@load-balancer
+@mail-server
+@mysql
+@network-server
+@smb-server
+@sql-server
+@web-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+hyphen-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end

fedora-install-server.ks

@@ -0,0 +1,135 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+-fedora-productimg-cloud
+fedora-productimg-server
+-fedora-productimg-workstation
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-syslog-ng*
+-astronomy-bookmarks
+-generic-logos*
+-generic-release*
+-GConf2-dbus*
+-bluez-gnome
+-community-mysql*
+
+# core
+kernel*
+dracut-*
+
+# No desktops
+-cinnamon*
+-enlightenment*
+-gnome-shell
+-gnome-session
+-kde*
+-lightdm-kde
+-lightdm-razorqt
+# Pulls in qt
+-oprofile-gui
+
+-@legacy-fonts
+
+-@multimedia
+
+## common stuff
+@guest-agents
+@standard
+@core
+@hardware-support
+@networkmanager-submodules
+
+# Fedora Server.
+# Including this causes the fedora-release-server package to be included,
+# which in turn enables server-product-environment, and due to to its priority
+# this will be the default environment.
+@^server-product-environment
+@server-product
+@headless-management
+@container-management
+@domain-client
+@server-hardware-support
+
+# Common server packages
+@mysql
+@sql-server
+@web-server
+
+# Web Server environment
+@haproxy
+@mongodb
+@python-web
+@php
+@rubyonrails
+@tomcat
+
+# Infrastructure Server
+@directory-server
+@dogtag
+@dns-server
+@freeipa-server
+@ftp-server
+@mail-server
+@network-server
+@printing
+@smb-server
+@virtualization-headless
+@load-balancer
+@ha
+
+@javaenterprise
+
+# “uservisible” groups we want to offer
+@editors
+@network-server
+@system-tools
+@text-internet
+
+# Things needed for installation
+@anaconda-tools
+fedora-productimg-server
+
+# Langpacks
+autocorr-*
+hunspell-*
+man-pages-*
+-gimp-help-*
+
+# Removals
+-PackageKit-zif
+-zif
+%end

fedora-install-workstation.ks

@@ -0,0 +1,51 @@
+# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Maintained by the Fedora Release Engineering team:
+# https://fedoraproject.org/wiki/ReleaseEngineering
+# mailto:rel-eng@lists.fedoraproject.org
+
+# Use a part of 'iso' to define how large you want your isos.
+# Only used when composing to more than one iso.
+# Default is 695 (megs), CD size.
+# Listed below is the size of a DVD if you wanted to split higher.
+#part iso --size=4998
+
+# Add the repos you wish to use to compose here.  At least one of them needs group data.
+
+# Only uncomment repo commands in one of the two following sections.
+# Because the install kickstart doesn't use the updates repo and does 
+# use the source repo, we can't just include fedora-repo.ks
+
+# In the master branch the rawhide repo commands should be uncommented.
+#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+# In non-master branches the fedora repo commands should be uncommented
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+%include fedora-workstation-packages.ks
+
+# Package manifest for the compose.  Uses repo group metadata to translate groups.
+# (default groups for the configured repos are added by --default)
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default
+
+# pungi is an inclusive depsolver so that multiple packages are brought 
+# in to satisify dependencies and we don't always want that. So we  use
+# an exclusion list to cut out things we don't want
+-kernel*debug*
+-kernel-kdump*
+-kernel-tools*
+-astronomy-bookmarks
+-generic*
+
+# core
+kernel*
+
+# Things needed for installation
+@anaconda-tools
+-fedora-productimg-cloud
+-fedora-productimg-server
+fedora-productimg-workstation
+
+%end

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

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

fedora-kde-packages.ks

@@ -0,0 +1,28 @@
+%packages
+@kde-apps
+@kde-desktop
+@kde-media
+@kde-office
+@kde-telepathy
+@networkmanager-submodules
+
+### The KDE-Desktop
+
+### Browser
+firefox
+
+### fixes
+
+# use kde-print-manager instead of system-config-printer
+-system-config-printer
+# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
+mariadb-embedded
+mariadb-libs
+mariadb-server
+
+# minimal localization support - allows installing the kde-l10n-* packages
+system-config-language
+kde-l10n
+
+%end
+

fedora-live-astronomy_kde.ks

@@ -14,48 +14,83 @@
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix
 
-%include fedora-live-kde-base.ks
-%include fedora-live-minimization.ks
+%include fedora-live-kde.ks
 
 # The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 16000
+part / --size 12288
 
 %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
+gcx
 psfex
+saoimage
 scamp
 sextractor
-#siril
+siril
 skyviewer
 swarp
-wcstools
 
-# Observatory: KStars + INDI drivers
-indi-3rdparty-drivers
-indistarter
+# Observatory: KStars + INDI drivers + Skychart
+indi-aagcloudwatcher
+indi-apogee
+indi-eqmod
+indi-gphoto
+indi-sx
 kstars
+skychart
+skychart-data-dso
+skychart-data-stars
+stellarium
 
 # misc. astronomy
-#celestia
-stellarium
-#virtualplanet
+celestia
+xvarstar
 
 # Some astro environment stuff
+astronomy-bookmarks
 astronomy-menus
 astronomy-menus-toplevel
 
+#Devel tools
+
+#Install the mandatory packages from dev-tools and dev-libs
+# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
+@development-tools
+@development-libs
+@c-development
+@rpm-development-tools
+# for astronomy
+cfitsio-devel
+CCfits-devel
+libnova-devel
+wcslib-devel
+
+
+#python 2 tools/libraries not included from the groups
+python-tools
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+python-networkx
+python-pandas
+# Python astronomy
+astropy-tools
+python-astropy
+python-astroML
+python-photutils
+python-sep
+pyephem
+APLpy
+ATpy
+
+
 #python 3 and tools/libraries not included from the groups
 python3
 python3-tools
@@ -68,52 +103,48 @@ 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
+python-matplotlib-qt4
+python-matplotlib-qt5
+python-matplotlib-tk
+python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk
 
 
 # Python IDE very useful for scientific use
-python3-spyder
+spyder
 
-# BOINC for distributed computing
-boinc-client
-boinc-manager
 
 #Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
 git
 git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
 
 #Drawing, Picture viewing tools, Visualization tools
 dia
 gimp
+inkscape
 kst
 kst-docs
 kst-fits
-# LabPlot currently not installable due to #2044284
-#LabPlot
+scidavis
 
 #Misc. Utils
 ImageMagick
@@ -122,9 +153,6 @@ 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-*

fedora-live-base.ks

@@ -10,35 +10,39 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-zerombr
-clearpart --all
-part / --size 5120 --fstype ext4
-services --enabled=NetworkManager,ModemManager --disabled=sshd
-network --bootproto=dhcp --device=link --activate
-rootpw --lock --iscrypted locked
-shutdown
+part / --size 4096 --fstype ext4
+services --enabled=NetworkManager,ModemManager --disabled=network,sshd
 
 %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
 aajohan-comfortaa-fonts
@@ -46,61 +50,287 @@ aajohan-comfortaa-fonts
 # 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
-systemctl enable livesys.service
-systemctl enable livesys-late.service
+# FIXME: it'd be better to get this installed from a package
+cat > /etc/rc.d/init.d/livesys << EOF
+#!/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
+    \$*
+}
+
+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
+
+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.software download-updates '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 || :
+
+# Don't sync the system clock when running live (RHBZ #1018162)
+sed -i 's/rtcsync//' /etc/chrony.conf
+
+# Mark things as configured
+touch /.liveimg-configured
+
+# add static hostname to work around xauth bug
+# https://bugzilla.redhat.com/show_bug.cgi?id=679486
+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
 
+# As livecd-creator is still yum based, we only get yum's yumdb during the
+# image compose. Migrate this over to dnf so that dnf and PackageKit can keep
+# track where packages came from.
+if [ ! -d /var/lib/dnf ]; then
+  mkdir -p /var/lib/dnf
+  mv /var/lib/yum/yumdb /var/lib/dnf/
+  rm -rf /var/lib/yum/
+fi
+
 # make it so that we don't do writing to the overlay for things which
 # are just tmpdirs/caches
 # note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
 cat >> /etc/fstab << EOF
 vartmp   /var/tmp    tmpfs   defaults   0  0
+varcacheyum /var/cache/yum  tmpfs   mode=0755,context=system_u:object_r:rpm_var_cache_t:s0   0   0
 EOF
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
+releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
+basearch=$(uname -i)
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
-rpm -qa --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
 
+# forcibly regenerate fontconfig cache (so long as this live image has
+# fontconfig) - see #1169979
+if [ -x /usr/bin/fc-cache ] ; then
+   fc-cache -f
+fi
+
 echo 'File created by kickstart. See systemd-update-done.service(8).' \
     | tee /etc/.updated >/var/.updated
 
-# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
-# See bug 1317709
-rm -f /boot/*-rescue*
-
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-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/licenses/*-release/* $LIVE_ROOT/
+
+# only works on x86, x86_64
+if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
+  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+fi
+%end

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

fedora-live-cinnamon.ks

@@ -7,9 +7,10 @@
 # - Dan Book <grinnz@grinnz.com>
 
 %include fedora-live-base.ks
-%include fedora-cinnamon-common.ks
+%include fedora-live-minimization.ks
+%include fedora-cinnamon-packages.ks
 
-part / --size=8192
+part / --size=6144
 
 %post
 # cinnamon configuration
@@ -21,8 +22,29 @@ 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
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Cinnamon as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# and mark it as executable
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# this goes at the end after all other changes. 
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+EOF
 
 %end
 

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

fedora-live-design_suite.ks

@@ -1,17 +1,100 @@
 # 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
+# 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-workstation.ks
-%include fedora-design-suite-common.ks
 
-# Size partition
-part / --size 14336
+#DVD size partition
+part / --size 8192
+
+%packages
+# graphics
+blender
+#LuxRender-blender
+YafaRay-blender
+bluefish 
+colord-extra-profiles
+darktable
+dia
+entangle
+fontforge
+font-manager 
+gimp
+gimp-elsamuko
+gimp-*-plugin
+gimp-data-extras
+gimp-gap
+gimp-paint-studio
+gimp-high-pass-filter
+gimp-normalmap
+gimp-resynthesizer
+gimp-separate+
+gpick
+GraphicsMagick
+gmic-gimp
+hugin 
+ImageMagick
+inkscape
+inkscape-sozi
+inkscape-table
+mypaint
+nautilus-image-converter
+optipng
+phatch
+screenruler
+simple-scan
+scribus
+shutter
+synfigstudio
+xournal
+
+# office
+vym
+pdfmod
+pdfshuffler  
+
+# internet
+filezilla
+sparkleshare
+sshpass
+
+# audio & video
+audacity
+pitivi
+
+# fonts
+aajohan-comfortaa-fonts
+adobe-source-sans-pro-fonts
+campivisivi-titillium-fonts
+lato-fonts
+open-sans-fonts
+overpass-fonts
+
+# Extra wallpapers
+f23-backgrounds-extras-base
+f23-backgrounds-extras-gnome
+
+# removal of unneeded applications
+-gnome-boxes
+-gthumb
+-eog
+-gnome-photos
+-rdesktop
+
+%end
 
 %post
+#Override the favorite desktop application in Dash
+cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+FOE
+
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -51,22 +134,6 @@ 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
 

fedora-live-games.ks

@@ -1,24 +1,13 @@
-# fedora-live-games.ks
+# fedora-livedvd-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:
+# Maintainer(s):
 # - Bruno Wolff III <bruno@wolff.to>
-#   https://fedoraproject.org/wiki/User:Bruno
-#
-# - Rahul Sundaram <sundaram@fedoraproject.org>
-#   https://fedoraproject.org/wiki/User:Sundaram
-#
+# - Formerly maintained by Rahul Sundaram
 
 %include fedora-live-xfce.ks
 
 # The recommended part size for DVDs is too close to use for the games spin
-part / --size 14336
+part / --size 10240
 
 %packages
 
@@ -48,6 +37,7 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
+btanks
 bzflag
 crossfire-client
 extremetuxracer
@@ -57,20 +47,21 @@ freecol
 freedoom
 freedroidrpg
 frozen-bubble
-# glob2 - currently broken
+gl-117
+glob2
 lincity-ng
-#tmw - currently broken
-#maniadrive - currently broken
-#maniadrive-music - has been retired
+tmw
+maniadrive
+maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
-#pinball # Would pull in fluid-soundfont-lite-patches
+pinball
 scorched3d
-# supertux # Crashing
-supertuxkart
+supertux
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
@@ -93,11 +84,12 @@ glaxium
 gnubg
 gnugo
 haxima
-#hedgewars -- broken
+hedgewars
 kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
+londonlaw
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
@@ -106,9 +98,10 @@ openlierox
 pachi
 pioneers
 quarry
-# Ri-li cut for size
-# rogue # recently abandoned. Someone picked it up. Waiting for approval.
+Ri-li
+rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
+seahorse-adventures
 solarwolf
 sopwith
 stormbaancoureur
@@ -120,6 +113,7 @@ xblast
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
+lmarbles
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
@@ -136,13 +130,14 @@ KoboDeluxe
 Maelstrom
 methane
 njam
+seahorse-adventures
 shippy
 tecnoballz
 wordwarvi
 xgalaxy
 # zasx # Would pull in fluid-soundfont-lite-patches
 
-# falling blocks games (small)
+# falling blocks games (small) 
 
 amoebax
 crack-attack
@@ -152,12 +147,14 @@ gweled
 
 # puzzles (big)
 enigma
-# fillets-ng # broken in f34
+fillets-ng
 pingus
 
 # puzzles (small)
 
+escape
 # gbrainy Removed for space - only game that pulls in mono
+magicor
 mirrormagic
 pipenightdreams
 pipepanic
@@ -167,11 +164,15 @@ vodovod
 
 # card games
 
+#poker2d - dropped from F14 for being orphaned
 PySolFC
 
 # educational/simulation
 
-#celestia - not currently building
+bygfoot
+celestia
+childsplay
+gcompris
 planets
 tuxpaint
 tuxpaint-stamps
@@ -180,13 +181,16 @@ tuxtype2
 # kde based games
 taxipilot
 
-# compilations (we are avoiding compilations, rare exceptions)
-bsd-games
-
 # 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
 

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
-

fedora-live-jam_kde.ks

@@ -7,9 +7,11 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 
-# Maintainer: JT Pennington (q5sys) <jt@obs-sec.com>
+# Maintainer: Jørn Lomax <northlomax@gmail.com>
+#             https://fedoraproject.org/wiki/User:jvlomax
+#             Brendan Jones <brendan.jones.it@gmail.com>
 
-%include fedora-live-kde.ks
+%include fedora-livecd-kde.ks
 
 # DVD size partition
 part / --size 10240 --fstype ext4
@@ -18,10 +20,124 @@ part / --size 10240 --fstype ext4
 bootloader --append="threadirqs"
 
 %packages
-@audio
 
-#pipewire
-pipewire
+#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
+ffado
+
+#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
@@ -32,15 +148,38 @@ 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
 
@@ -49,34 +188,33 @@ kernel-tools
 firefox
 thunderbird
 
-#remove packages not needed
--akregator
--kaddressbook
--kmail
--kontact
--korganizer
--non-mixer
--non-session-manager
--non-sequencer
+#remove packages not need
+#-kdesdk-umbrello
+#-kdesdk-kcachegrindy
+
+#-kdesdk-kompare
+#-kdepim
 
 %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
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<FOE  >> /etc/skel/.config/kickoffrc
+cat <<EOF  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
-FOE
+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
 

fedora-live-kde-base.ks

@@ -3,7 +3,7 @@
 # mailto:kde@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-kde-common.ks
+%include fedora-kde-packages.ks
 
 %post
 
@@ -19,7 +19,70 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF
 gtk-theme-name = Adwaita
 EOF
 
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# set up autologin for user liveuser
+if [ -f /etc/sddm.conf ]; then
+sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
+else
+cat > /etc/sddm.conf << SDDM_EOF
+[Autologin]
+User=liveuser
+Session=plasma.desktop
+SDDM_EOF
+fi
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/liveuser/.config/
+cat > /home/liveuser/.config/kickoffrc << MENU_EOF
+[Favorites]
+FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+MENU_EOF
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+# set executable bit disable KDE security warning
+chmod +x /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
+
+# Set akonadi backend
+mkdir -p /home/liveuser/.config/akonadi
+cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
+[%General]
+Driver=QSQLITE3
+AKONADI_EOF
+
+# Disable plasma-pk-updates
+sed -i \
+    -e "s|^X-KDE-PluginInfo-EnabledByDefault=true|X-KDE-PluginInfo-EnabledByDefault=false|g" \
+    /usr/share/plasma/plasmoids/org.kde.plasma.pkupdates/metadata.desktop \
+    /usr/share/kservices5/plasma-applet-org.kde.plasma.pkupdates.desktop
+
+# Disable baloo
+cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
+[Basic Settings]
+Indexing-Enabled=false
+BALOO_EOF
+
+# Disable kres-migrator
+cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
+[Migration]
+Enabled=false
+KRES_EOF
+
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF
 
 %end

fedora-live-kde.ks

@@ -11,7 +11,66 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=8000
+part / --size=6144
+
+
+%packages
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
+-kdeartwork-screensavers	# screensavers are not needed on live images
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# ~23 megs (mysql-embedded etc.)
+-kipi-plugins			# ~8 megs + drags in Marble
+#-kdeplasma-addons		# ~16 megs
+#-krusader			# ~4 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+k3b				# ~15 megs
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+liveusb-creator
+
+# only include kdegames-minimal
+-kdegames
+kdegames-minimal
+
+### space issues
+
+# fonts (we make no bones about admitting we're english-only)
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
+#-stix-fonts		# mathematical symbols
+
+# remove input methods to free space
+-@input-methods
+-scim*
+-m17n*
+-ibus*
+-iok
+
+# save some space (from @standard)
+-make
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
+## avoid serious bugs by omitting broken stuff
+
+%end
 
 %post
 %end

fedora-live-lxde.ks

@@ -8,7 +8,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-lxde-common.ks
+%include fedora-lxde-packages.ks
 
 %post
 # LXDE and LXDM configuration
@@ -19,8 +19,46 @@ PREFERRED=/usr/bin/startlxde
 DISPLAYMANAGER=/usr/sbin/lxdm
 EOF
 
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="lxde"/' /etc/sysconfig/livesys
+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
 

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
-

fedora-live-mate_compiz.ks

@@ -4,13 +4,82 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-mate-common.ks
+%include fedora-mate-packages.ks
 %include fedora-live-minimization.ks
 
-part / --size 8192
+part / --size 6144
 
-%post
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys
+%packages
+
+# Drop things for size
+-@3d-printing
+-brasero
+-colord
+-fedora-icon-theme
+-GConf2
+-gnome-bluetooth-libs
+-gnome-icon-theme
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-themes
+-gnome-themes-standard
+-gnome-user-docs
+
+-@mate-applications
+-mate-icon-theme-faenza
+
+# Drop oversized fonts that aren't needed
+
+# Drop things that pull in perl
+
+# Dictionaries are big
+# we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
+# strong preference to giving it a go on #fedora-desktop.
+# also see http://bugzilla.gnome.org/681084
+
+# Help and art can be big, too
+-gnome-user-docs
+-evolution-help
+
+# Legacy cmdline things we don't want
+-telnet
+
+%end
+
+%post
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+
+# 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
+
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
 
 %end

fedora-live-minimization.ks

@@ -4,6 +4,20 @@
 %packages
 
 # save some space
+-mpage
+-sox
 -hplip
+-hpijs
+-numactl
+-isdn4k-utils
+-autofs
+# smartcards won't really work on the livecd.
+-coolkey
+-wget
+
+# scanning takes quite a bit of space :/
+-xsane
+-xsane-gimp
+-sane-backends
 
 %end

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

fedora-live-robotics.ks

@@ -1,18 +1,16 @@
-# Maintained by x3mboy and the Fedora Robotics SIG:
-# https://fedoraproject.org/wiki/SIGs/Robotics
-# mailto:x3mboy@fedoraproject.org
+# Maintained by the Fedora Robotics SIG:
+# http://fedoraproject.org/wiki/SIGs/Robotics
 # 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
-@^workstation-product-environment
+@gnome-desktop
 
 # Add robotics development packages
 @robotics-suite
@@ -29,13 +27,9 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
--@dial-up
--@input-methods
--@standard
--@container-management
--@libreoffice
--@networkmanager-submodules
--@workstation-product
+
+# Add a web browser
+firefox
 
 # 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,8 +70,10 @@ mercurial
 -mtr
 -pinfo
 -rsh
+-nfs-utils
 -ypbind
 -yp-tools
+-rpcbind
 -acpid
 -ntsysv
 
@@ -90,9 +86,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 >> /var/lib/livesys/livesys-session-extra << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
@@ -105,6 +101,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.software.gschema.override << FOE
+[org.gnome.software]
+download-updates=false
+FOE
+
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
   # Show harddisk install in shell dash
@@ -114,7 +116,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 +124,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

fedora-live-scientific_kde.ks

@@ -1,20 +1,176 @@
-# Fedora Scientific with KDE Desktop
+#fedora-livedvd-scientific-kde.ks
+# With KDE Desktop
 
 # Fedora Scientific: For researchers in Science and Engineering
 # Fedora-Scientific aims to create a Fedora which has the generic
 # toolset for the researcher
-# Web: https://labs.fedoraproject.org/en/scientific/
+# Web: https://fedoraproject.org/wiki/Scientific_Spin
+# Web: http://spins.fedoraproject.org/scientific-kde/
 
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 
-%include fedora-live-kde-base.ks
-%include fedora-live-minimization.ks
-%include fedora-scientific-common.ks
+%include fedora-live-kde.ks
 
 # The recommended part size for DVDs is too close to use for the scientific spin
-part / --size 15000
+part / --size 12288
+
+%packages
+
+# Installing the default/mandatory packages from engineering & scientific
+@engineering-and-scientific
+
+# scilab
+#scilab
+#scilab-devel
+#scilab-doc
+
+# sagemath
+# BZ #1006230 should fix this
+#sagemath
+#sagemath-notebook
+
+#Devel tools
+
+#Install the mandatory packages from dev-tools and dev-libs
+# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
+@development-tools
+@development-libs
+@c-development
+@rpm-development-tools
+#others, not included
+# C++ libraries
+blitz-devel
+armadillo-devel
+
+# Misc. related utils
+ddd
+valgrind
+
+#python 2 tools/libraries not included from the groups
+python-tools
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+python-networkx
+python-pandas
+
+#python 3 and tools/libraries not included from the groups
+python3
+python3-tools
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-sympy
+python3-networkx
+python3-pandas
+
+# matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
+python3-matplotlib-qt4
+python3-matplotlib-tk
+
+# Include Java development tools
+@java-development
+apache-commons-math
+
+#fortran compiler
+gcc-gfortran
+
+# GUI for R
+rkward
+
+# GUI for Octave
+qtoctave
+
+# IDEs for the IDE folks
+@eclipse
+spyder
+
+#writing & publishing
+emacs
+emacs-color-theme
+vim
+scribus
+#scite
+lyx
+kile
+
+#Presentation, Bibliography & Document arrangement 
+#tools
+BibTool
+pdfshuffler
+
+# Parallel/Distributed computing libraries/tools
+openmpi
+openmpi-devel
+valgrind-openmpi
+libgomp
+python-pp
+mpi4py-openmpi
+python3-mpi4py-openmpi
+
+#Version control- a GUI for each as well
+
+# Installing rapidsvn will also install subversion package
+rapidsvn 
+git
+git-gui
+# Mercurial
+mercurial
+mercurial-hgk
+
+#Backup Utilities
+backintime-kde
+
+#needs to install this specifically because of some conflict between openmpi
+#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
+libotf
+
+#root
+root
+root-gui-fitpanel
+root-python
+
+#Multiple jobs/clustering system
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
+
+#Drawing, Picture viewing tools, Visualization tools
+dia
+inkscape
+xzgv
+gimp
+ggobi
+ggobi-devel
+g3data
+Mayavi
+
+#Misc. Utils
+screen
+tmux
+rlwrap
+hexchat
+shutter
+fig2ps
+bibtex2html
+hevea
+
+#Include Mozilla Firefox
+firefox
+
+%end
 
 %post
 
-%end
+%end

fedora-live-security.ks

@@ -6,10 +6,10 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
-#   JT Pennington <jt [AT] fedoraproject <dot> org>
+#   Christoph Wickert <cwickert [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
-#   many thanks, especially to Christoph Wickert!
+#   many thanks!
 #   Fedora LXDE Spin - Copied over stuff to make LXDE Default
 #   Luke Macken and Adam Miller for the original OpenBox Security ks and all
 #   the Security Applications! 
@@ -22,9 +22,7 @@
 part / --size 10240
 
 %packages
-# install env-group to resolve RhBug:1891500
-@^xfce-desktop-environment
-
+@xfce-desktop
 @xfce-apps
 
 # Security tools
@@ -39,7 +37,8 @@ gnome-keyring-pam
 -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
 -aspell-*                   # dictionaries are big
 -gnumeric
 -foomatic-db-ppds
@@ -95,6 +94,9 @@ gnome-keyring-pam
 %post
 # xfce configuration
 
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
 # create /etc/sysconfig/desktop (needed for installation)
 
 cat > /etc/sysconfig/desktop <<EOF
@@ -102,7 +104,50 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
+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

fedora-live-soas.ks

@@ -4,16 +4,123 @@
 # - 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>
+# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-soas-common.ks
+%include fedora-soas-packages.ks
+
+firewall --enabled --service=mdns,presence
 
 %post
 
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
+# Get proper release naming in the control panel
+cat >> /boot/olpc_build << EOF
+Sugar on a Stick
+EOF
+cat /etc/fedora-release >> /boot/olpc_build
+
+# Add our activities to the favorites
+cat > /usr/share/sugar/data/activities.defaults << EOF
+org.laptop.WebActivity
+org.laptop.HelpActivity
+org.laptop.Chat
+org.laptop.sugar.ReadActivity
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
+org.laptop.Calculate
+org.laptop.Clock
+org.laptop.ImageViewerActivity
+org.laptop.Memorize
+org.laptop.physics
+org.laptop.Pippy
+org.laptop.RecordActivity
+org.laptop.Oficina
+org.laptop.StopWatchActivity
+org.laptop.community.Finance
+org.laptop.community.TypingTurtle
+org.laptop.sugar.Jukebox
+org.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
+# Disable the logout menu item in Sugar
+# Enable Sugar power management
+cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+EOF
+
+cat >> /etc/rc.d/init.d/livesys-late << EOF
+
+# disable screensaver locking
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+FOE
+
+# and hide the lock screen option
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+FOE
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late
 
 %end

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
-

fedora-live-workstation.ks

@@ -3,18 +3,73 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-workstation-common.ks
-#
-# Disable this for now as packagekit is causing compose failures
-# by leaving a gpg-agent around holding /dev/null open.
-#
-#include snippets/packagekit-cached-metadata.ks
+%include fedora-workstation-packages.ks
+%include snippets/packagekit-cached-metadata.ks
 
-part / --size 7750
+part / --size 6144 
 
 %post
 
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+
+# disable updates plugin
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
+[org.gnome.software]
+download-updates=false
+FOE
+
+# don't run gnome-initial-setup
+mkdir ~liveuser/.config
+touch ~liveuser/.config/gnome-initial-setup-done
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+  # need to move it to anaconda.desktop to make shell happy
+  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.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
+
+  # Copy Anaconda branding in place
+  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
+    cp -a /usr/share/lorax/product/* /
+  fi
+fi
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up auto-login
+cat > /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF
 
 %end

fedora-live-xfce.ks

@@ -11,14 +11,14 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-xfce-common.ks
-
-# need a bigger /
-part / --size 6144
+%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
@@ -26,8 +26,51 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
+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
 

fedora-lxde-packages.ks

@@ -8,12 +8,11 @@
 
 %packages
 ### LXDE desktop
-# install env-group to resolve RhBug:1891500
-@^lxde-desktop-environment
-
+@lxde-desktop
 @lxde-apps
 @lxde-media
 @lxde-office
+@networkmanager-submodules
 
 # FIXME: can be omitted once comps is updated
 midori
@@ -40,12 +39,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

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
-

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

fedora-mate-packages.ks

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

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

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

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

fedora-phosh-common.ks

@@ -1,13 +0,0 @@
-# fedora-phosh-common.ks
-#
-# Description:
-# - Fedora Disk image Spin with the phosh window manager
-#
-# Maintainer(s):
-# - Kevin Fenzi       <kevin@scrye.com>
-
-%packages
-# install env-group to resolve RhBug:1891500
-@^phosh-desktop-environment
-
-%end

fedora-python-classroom-common.ks

@@ -1,45 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# Common packages of all Python Classroom images
-
-%packages
-@python-classroom
-@python-science
-nano
-openssh-clients
-vim-enhanced
-wget
-
-# Remove Pythons possibly recommended by tox
--python2
--python26
--python27
--python33
--python34
--python35
--python36
--python37
--python38
--python2.7
--python3.5
--python3.6
--python3.7
--python3.8
--python3.9
--python3.10
--pypy
-
-# Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
-#               and https://bugzilla.redhat.com/show_bug.cgi?id=1902354
--texlive-base
--texlive-latex
-
-# Remove gdal recommended by networkx, brings in close to 600M of proj data
-# Also explicitly list proj to make sure both packages are gone
-# https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/LGC5IMMHZ4DM7GQNPAFC6GU362PPTN7O/
--python3-gdal
--proj
-
-%end

fedora-python-classroom-gnome-common.ks

@@ -1,107 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# GNOME part of Python Classroom images
-
-%include fedora-python-classroom-common.ks
-
-%packages
-emacs
-python3-matplotlib-tk
-python3-pillow-tk
-
-# Remove extra gnome-y things
--@graphical-internet
--@games
--@sound-and-video
--@multimedia
--dleyna*
--gnome-boxes
--gnome-calendar
--gnome-clocks
--gnome-contacts
--gnome-disk-utility
--gnome-documents
--gnome-font-viewer
--gnome-maps
--gnome-photos
--gnome-weather
--grilo-plugins
--cheese
--totem
--totem-nautilus
-
-# This is no longer workstation
--@workstation-product
-
-# But we want to keep the Fedora desktop backgrounds
-desktop-backgrounds-gnome
-
-# Add a web browser
-@firefox
-
-# Remove office suite
--@libreoffice
--libreoffice-*
--planner
-
-# Drop the Java plugin and Java
--icedtea-web
--*openjdk*
-
-# No printing
--@printing
--foomatic-db-ppds
--foomatic
-
-# Dictionaries are big
--aspell-*
--words
-
-# Help and art can be big, too
--gnome-user-docs
--desktop-backgrounds-basic
--*backgrounds-extras
-
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
-# Don't need this
--linux-atm
-
-# Drop some system-config things
--system-config-language
--system-config-network
--system-config-rootpassword
--system-config-services
--policycoreutils-gui
-
-# Inkscape is too big to be included
--inkscape
-
-%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

fedora-python-classroom-vagrant.ks

@@ -1,8 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# Like the Python Classroom image, but tuned for vagrant.
-
-%include fedora-cloud-base-vagrant.ks
-%include fedora-python-classroom-common.ks

fedora-repo-not-rawhide.ks

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

fedora-repo-rawhide.ks

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

fedora-repo.ks

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

fedora-scientific-common.ks

@@ -1,141 +0,0 @@
-%packages
-
-# Installing the default/mandatory packages from engineering & scientific
-@engineering-and-scientific
-
-# scilab
-## scilab
-## scilab-devel
-## scilab-doc
-
-# Remove sagemath explicitly?
--sagemath
-
-#Devel tools
-
-#Install the mandatory packages from dev-tools and dev-libs
-# C/C++ compiler, gdb, autotools, bison, flex, make, strace..
-@development-tools
-@development-libs
-@c-development
-@rpm-development-tools
-#others, not included
-# C++ libraries
-blitz-devel
-armadillo-devel
-
-# Misc. related utils
-ddd
-valgrind
-
-
-#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
-python3-matplotlib-tk
-
-# Include Java development tools
-@java-development
-apache-commons-math
-
-#fortran compiler
-gcc-gfortran
-
-# GUI for R
-rkward
-
-# julia
-julia
-julia-doc
-julia-devel
-
-python3-spyder
-python3-spyder-kernels
-
-
-#writing & publishing
-emacs
-emacs-color-theme
-vim
-scribus
-#scite
-lyx
-kile
-
-#Presentation, Bibliography & Document arrangement 
-#tools
-BibTool
-pdfshuffler
-
-# Parallel/Distributed computing libraries/tools
-openmpi
-openmpi-devel
-valgrind-openmpi
-libgomp
-python3-mpi4py-openmpi
-python3-mpi4py-mpich
-
-#Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
-git
-git-gui
-# Mercurial
-mercurial
-mercurial-hgk
-
-#Backup Utilities
-backintime-kde
-
-#needs to install this specifically because of some conflict between openmpi
-#and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
-libotf
-
-#root
-root
-root-gui-fitpanel
-
-#Multiple jobs/clustering system
-# torque
-# torque-server
-# torque-scheduler
-# torque-gui
-# torque-libs
-# torque-mom
-# python-pbs
-
-#Drawing, Picture viewing tools, Visualization tools
-dia
-inkscape
-xzgv
-gimp
-## ggobi
-## ggobi-devel
-#g3data
-#Mayavi
-
-#Misc. Utils
-screen
-tmux
-rlwrap
-hexchat
-fig2ps
-hevea
-
-#Include Mozilla Firefox
-firefox
-
-%end

fedora-scientific-vagrant.ks

@@ -1,12 +0,0 @@
-# Fedora Scientific  Vagrant box
-
-# 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-cloud-base-vagrant.ks
-%include fedora-scientific-common.ks

fedora-server-vm-full.ks

@@ -1,201 +0,0 @@
-# fedora-server-vm-full.ks (rel. 1.01)
-# Kickstart file to build a Fedora Server Edition VM disk image.
-# The image aims to resemble as close as technically possible the
-# full features of a Fedora Server Edition in a virtual machine.
-#
-# The image uses GPT partition type as of default in Fedora 37.
-#
-# At first boot it opens a text mode basic configuration screen.
-#
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To build the image locally, you need to install ImageFactory and
-# various additional helpers and configuration files.
-# See Fedora Server Edition user documentation tutorial.
-
-# Use text mode install
-text
-
-# Keyboard layouts
-keyboard 'us'
-
-# System language
-lang en_US.UTF-8
-
-# System timezone
-# set time zone to GMT (Etcetera/UTC)
-timezone Etc/UTC --utc
-
-
-# Root password
-rootpw --iscrypted --lock locked
-
-# SELinux configuration
-selinux --enforcing
-
-
-# System bootloader configuration
-bootloader --location=mbr --timeout=1 --append="console=tty1 console=ttyS0,115200n8"
-
-# Network information
-network  --bootproto=dhcp --device=link --activate --onboot=on
-
-# Firewall configuration
-firewall --enabled --service=mdns
-
-
-# System services
-services --enabled="sshd,NetworkManager,chronyd,initial-setup"
-
-# Run the Setup Agent on first boot
-firstboot --reconfig
-
-# Partition Information. Use GPT by default (since Fedora 37)
-# Resemble the Partitioning used for Fedora Server Install media
-clearpart --all --initlabel --disklabel=gpt
-reqpart --add-boot
-part pv.007     --size=4000  --grow
-volgroup  sysvg  pv.007
-logvol / --vgname=sysvg --size=4000 --grow --maxsize=16000 --fstype=xfs --name=root --label=sysroot
-
-
-# Include URLs for network installation dynamically, dependent on Fedora release
-# and imagefactory runtime environment
-%include fedora-repo.ks
-
-# Shutdown after installation
-shutdown
-
-
-
-##### begin package list #############################################
-%packages --inst-langs=en
-
-@server-product
-@core
-@headless-management
-@standard
-@networkmanager-submodules
-# container management is an optional install item on disk media.
-# Install options not available with VMs. So we don't include it
-# despite trying to resemble a DVD installation as close as possible.
-##@container-management
-@domain-client
-@guest-agents
-
-# All arm-tools packages install on aarch64/armhfp only
-# TODO: on a x86_64 devel environment are @arm-tools not available
-# and cause a build error.
-# @arm-tools
-
-# Standard Fedora Package Groups
-## dracut-config-generic  ## included in =core=
-glibc-all-langpacks
-initial-setup
-kernel-core
--dracut-config-rescue
--generic-release*
--initial-setup-gui
--kernel
--linux-firmware
--plymouth
-# pulled in by @standard
--smartmontools
--smartmontools-selinux
-
-%end
-##### end package list ###############################################
-
-
-##### begin kickstart post script ####################################
-%post --erroronfail  --log=/root/anaconda-post-1.log
-
-# Find the architecture we are on
-arch=$(uname -m)
-
-# Import RPM GPG key, during installation saved in /etc/pki
-echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-# 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"
-# The newly installed instance should make it's own
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
-
-# 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 because the DNS server is environment specific.
-truncate -s 0 /etc/resolv.conf
-
-echo "Cleaning repodata to save space."
-dnf clean all
-
-# linux-firmware is installed by default and is quite large. As of mid 2020:
-#   Total download size: 97 M
-#   Installed size: 268 M
-# Not needed in virtual environment.
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
-
-# Will ever anybody see this?
-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*
-
-
-# Do we need a serial terminal with a VM?
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
- # 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
- sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
-fi
-
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
-##### end kickstart post script #####################################
-
-
-##### begin custom post script (after base) #########################
-%post
-
-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
-sync /
-rm -f /var/tmp/zeros
-sync /
-
-# 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 .
-
-# When we build the image /var/log gets populated.
-# Let's clean it up.
-echo "Cleanup leftover in /var/log"
-rm -rf /var/log/*
-
-%end
-##### end custom post script ########################################

fedora-soas-common.ks

@@ -1,123 +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>
-
-firewall --enabled --service=mdns,presence
-
-%packages
-# install env-group to resolve RhBug:1891500
-@^sugar-desktop-environment
-
-# == Core Sugar Platform ==
-fedora-release-soas
-
-# explicitly remove a bunch of extra stuff
--openbox
--@fonts
--@dial-up
--@multimedia
--@printing
--foomatic
--@gnome-desktop 
--yp-tools
--ypbind
--rdate
--rdist
--icedtea-web
--firefox
--glx-utils
--nmap-ncat
--PackageKit
--eekboard-libs
--open-vm-tools*
--gfs2-utils
--abrt-cli
--ibus*
--hyperv-daemons
--sane-backends
--sane-backends-drivers-scanners
--dhcp-client
--gcc-gdb-plugin
--gcc
-
-# Add some extra fonts
-dejavu-sans-fonts
-dejavu-sans-mono-fonts
-madan-fonts
-aajohan-comfortaa-fonts
-sil-abyssinica-fonts
-vlgothic-fonts
-
-# Usefulness for DSL connections as per:
-# http://bugs.sugarlabs.org/ticket/1951
-rp-pppoe
-
-# Useful for SoaS duplication from:
-# http://bugs.sugarlabs.org/ticket/74
-livecd-tools
-
-# Get the Sugar boot screen
--plymouth-system-theme
--plymouth-theme-charge
-
-%end
-
-%post
-
-# Get proper release naming in the control panel
-cat >> /boot/olpc_build << EOF
-Sugar on a Stick
-EOF
-cat /etc/fedora-release >> /boot/olpc_build
-
-# Rebuild initrd for Sugar boot screen
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-/usr/sbin/plymouth-set-default-theme sugar
-sed -i -r 's/(omit_dracutmodules\+\=.*) plymouth (.*)/\1 \2/' /etc/dracut.conf.d/99-liveos.conf
-dracut --force-add plymouth -N -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*
-
-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
-# Disable the logout menu item in Sugar
-# Enable Sugar power management
-cat >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
-[org.sugarlabs.user]
-default-nick='disabled'
-
-[org.sugarlabs]
-show-logout=false
-
-[org.sugarlabs.power]
-automatic=true
-EOF
-
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-
-%end
-
-%post --nochroot
-
-for n in initramfs initrd; do
-    for img in "$LIVE_ROOT/images/pxeboot/$n"* ; do
-        [ -e "$img" ] && cp -a "$INSTALL_ROOT"/boot/initramfs-*.img "$img"
-    done
-done
-
-%end
-

fedora-soas-packages.ks

@@ -0,0 +1,88 @@
+# fedora-livecd-soas.ks
+#
+# Description:
+# - A Sugar environment that you can carry in your pocket
+#
+# Maintainers:
+# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
+
+%packages
+-@fonts
+-@dial-up
+-@multimedia
+-@printing
+-foomatic
+-@gnome-desktop 
+-yp-tools
+-ypbind
+-rdate
+-rdist
+-icedtea-web
+-firefox
+-glx-utils
+-nmap-ncat
+-PackageKit
+-libfprint
+-realmd
+-eekboard-libs
+-open-vm-tools*
+-gfs2-utils
+-abrt-cli
+-ibus*
+-hyperv-daemons
+
+# Add some extra fonts
+dejavu-sans-fonts
+dejavu-sans-mono-fonts
+madan-fonts
+aajohan-comfortaa-fonts
+sil-abyssinica-fonts
+vlgothic-fonts
+
+# == Core Sugar Platform ==
+@sugar-desktop
+-sugar-ruler
+sugar-cp-updater
+lightdm
+lightdm-gtk
+
+# Write breaks unless we do this (we don't need it anyway)
+# enable for testing in the F17 dev cycle
+@input-methods
+
+# Needed for wifi, bluetooth and WWAN connection support
+@networkmanager-submodules
+
+# == Platform Components ==
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
+alsa-plugins-pulseaudio
+alsa-utils
+gstreamer1-plugins-base
+gstreamer1-plugins-good
+gstreamer1-plugins-bad-free
+gstreamer-plugins-espeak
+pulseaudio
+pulseaudio-utils
+
+# explicitly remove openbox and hopefully deal with what firstboot wants
+-openbox
+
+# remove deps that come from god knows where
+-sane-backends
+-sane-backends-drivers-scanners
+
+# Usefulness for DSL connections as per:
+# http://bugs.sugarlabs.org/ticket/1951
+rp-pppoe
+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools
+
+# Get the Sugar boot screen
+-plymouth-system-theme
+-plymouth-theme-charge
+sugar-logos
+
+%end

fedora-sway-common.ks

@@ -1,17 +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>
-
-%packages
-fedora-release-sway
-@^sway-desktop-environment
-@firefox
-@swaywm-extended
-%end