robotics: drop two more retired packages

player and stage were both retired as unmaintained orphans,
several weeks ago.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

custom/qa-test-day.ks

@@ -85,14 +85,14 @@ gtk-recordmydesktop
 gconf-editor
 dconf-editor
 nautilus-open-terminal
-iotop
+iotop-c
 htop
 
 # Add favorite power-user tools
 mc
 vim
 nano
-wget
+wget2-wget
 
 # Add dependencies for the welcome screen
 # (this makes it run also on non-GNOME systems)
@@ -111,7 +111,7 @@ firefox
 
 # "EOF" is quoted so that variables are not expanded. Search for "here-document"
 # in man bash.
-cat >> /etc/rc.d/init.d/livesys << "EOF"
+cat >> /var/lib/livesys/livesys-session-extra << "EOF"
 
 # Create Test Day welcome screen
 # Note that shebang must be written this way, else it is considered as comment

fedora-arm-base.ks

@@ -1,76 +0,0 @@
-#keyboard us
-lang en_US.UTF-8
-selinux --enforcing
-firewall --enabled --service=mdns,ssh
-
-bootloader --extlinux --location=mbr
-
-part /boot/efi --size=80 --fstype vfat --asprimary
-part /boot --size=512 --fstype ext4 --asprimary
-
-# make sure that initial-setup runs and lets us do all the configuration bits
-firstboot --reconfig
-
-services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup
-
-%include fedora-repo.ks
-
-%packages
-@core
-@standard
-@hardware-support
-
-kernel
-# remove this in %post
-dracut-config-generic
--dracut-config-rescue
-# install tools needed to manage and boot arm systems
-@arm-tools
--uboot-images-armv8
-chrony
-extlinux-bootloader
-bcm283x-firmware
-initial-setup
-initial-setup-gui
--iwl*
--ipw*
--usb_modeswitch
-#lets resize / on first boot
-# dracut-modules-growroot
-
-# make sure all the locales are available for inital0-setup and anaconda to work
-glibc-all-langpacks
-%end
-
-%post
-
-# Setup Raspberry Pi firmware
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-
-# work around for poor key import UI in PackageKit
-rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
-basearch=armhfp
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-echo "Packages within this ARM 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
-
-# Because memory is scarce resource in most arm systems we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-dnf -y remove dracut-config-generic
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end

fedora-arm-kde.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-kde-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=6300
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-lxde.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxde-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=4300
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-lxqt.ks

@@ -1,17 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-lxqt-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=4400
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%packages
-# trojita not available on non-x86 platforms
--trojita
-%end
-
-%post
-
-%end

fedora-arm-mate.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-mate-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=7168
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-minimal.ks

@@ -1,4 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-minimal-common.ks
-
-part / --size=1600 --fstype ext4

fedora-arm-python-classroom.ks

@@ -1,30 +0,0 @@
-# Maintained by the Fedora Python SIG:
-# http://fedoraproject.org/wiki/SIGs/Python
-# mailto:python-devel@lists.fedoraproject.org
-
-# The ARM Workstion based Python Classroom Lab
-
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
-%include fedora-python-classroom-gnome-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=7000
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%packages
--initial-setup
--initial-setup-gui
--libvirt*
--gnome-boxes
-
-%end
-
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
-
-%end
-

fedora-arm-server.ks

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

fedora-arm-soas.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-soas-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=3400
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-arm-workstation.ks

@@ -1,22 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-workstation-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=6200
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%packages
--initial-setup
--initial-setup-gui
--libvirt*
--gnome-boxes
-
-%end
-
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=256MB/' /boot/extlinux/extlinux.conf
-
-%end

fedora-arm-xbase.ks

@@ -1,17 +0,0 @@
-%packages
-@base-x
-@fonts
-@input-methods
-@multimedia
-@printing
-epiphany
-%end
-
-%post
-# Most of the ARM X accelerated drivers need some level of CMA allocation
-sed -i 's/\(append .*\)/\1 cma=192MB/' /boot/extlinux/extlinux.conf
-
-# Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
-%end

fedora-arm-xfce.ks

@@ -1,12 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-arm-xbase.ks
-%include fedora-xfce-common.ks
-
-part btrfs.007 --fstype="btrfs" --size=6000
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end

fedora-budgie-common.ks

@@ -0,0 +1,23 @@
+%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

@@ -14,10 +14,6 @@ fedora-release-cinnamon
 @^cinnamon-desktop-environment
 
 @libreoffice
-parole
-rhythmbox
-
-# extra backgrounds
-f33-backgrounds-extras-gnome
+exaile
 
 %end

fedora-cloud-base-azure.ks

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

@@ -9,9 +9,19 @@
 # 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 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
+bootloader --timeout=0 --location=mbr --append="no_timer_check 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
+# BZ 2193039: Ensure additional packages are present for ssh access management
+google-compute-engine-oslogin
+google-guest-agent
+-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

fedora-cloud-base-vagrant.ks

@@ -19,15 +19,9 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
-# The default koji Vagrantfile configuration uses rsync to sync files between
-# the vagrant host and the guest.  It uses yum to verify that rsync is present
-# and/or install it if it is not.  It will fail without adding the yum compat
-# layer for dnf
-# TODO: Teach vagrant about dnf
-dnf-yum
 # rsync gets installed when the Vagrant box is first launched on the
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image

fedora-cloud-base.ks

@@ -31,14 +31,20 @@ rootpw --lock --iscrypted locked
 
 firewall --disabled
 
-# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
-bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-zerombr
-clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+# 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
 
 %include fedora-repo.ks
 
@@ -50,6 +56,13 @@ reboot
 # Include packages for the cloud-server-environment group
 @^cloud-server-environment
 
+# Install the tracer dnf plugin to enable automatic reboots
+# IF the user requests package updates
+# AND requests a reboot
+# AND the packages updated require a reboot.
+# https://fedoraproject.org/wiki/Changes/Automatic_Cloud_Reboot_On_Updates
+python3-dnf-plugin-tracer
+
 # Don't include the kernel toplevel package since it pulls in
 # kernel-modules. We're happy for now with kernel-core.
 -kernel
@@ -76,9 +89,6 @@ qemu-guest-agent
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld
 
-# noswap on Cloud for now
--zram-generator-defaults
-
 # Don't include the geolite2 databases, which end up with 66MiB
 # in /usr/share/GeoIP
 -geolite2-country
@@ -90,6 +100,15 @@ qemu-guest-agent
 ##### 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
+
+# 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
@@ -110,16 +129,27 @@ basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 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 || :
-rm -f /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 /
 
 # 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
 

fedora-comp-neuro-common.ks

@@ -1,49 +0,0 @@
-# Description: Packages for the NeuroFedora computational neuroscience lab image.
-# 
-# Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
-# mailto:neuro-sig@lists.fedoraproject.org
-
-%packages
-fedora-release-compneuro
-# Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
-@python-science
-
-# Add julia and R
-R
-julia
-
-#Computational neuroscience packages
-arbor
-auryn-mpich
-auryn-openmpi
-bionetgen
-calcium-calculator
-COPASI
-qalculate
-getdp
-genesis-simulator
-gnuplot
-moose
-nest
-neuron
-octave
-# paraview
-python3
-python3-brian2
-python-brian2-doc
-python3-ipython
-python3-nest
-python3-netpyne
-python3-neuron
-python3-libNeuroML
-python3-neo
-# Currently broken in rawhide
-# python3-nineml
-# python-nineml-doc
-python3-PyLEMS
-python-PyLEMS-doc
-python3-steps
-smoldyn
-
-%end

fedora-container-base-minimal.ks

@@ -1,12 +1,12 @@
 # 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.
+# This base is a stripped back Fedora image without python3.
 # If you need that use the standard base image.
 
 %include fedora-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-microdnf
-
+dnf5
+-tzdata
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
@@ -33,11 +33,6 @@ 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/*
 

fedora-container-base.ks

@@ -5,16 +5,12 @@
 
 %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
-sssd-client
+dnf5
+dnf5-plugins
 sudo
 -glibc-langpack-en
--cracklib-dicts
 -langpacks-en
 %end
 
@@ -39,7 +35,7 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
-rm /run/nologin # https://pagure.io/atomic-wg/issue/316
+rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
 
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*

fedora-container-common.ks

@@ -18,7 +18,8 @@
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
+timezone --isUtc Etc/UTC
+timesource --ntp-disable
 rootpw --lock --iscrypted locked
 keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -34,10 +35,9 @@ fedora-release-container
 bash
 coreutils
 glibc-minimal-langpack
+tzdata
 rpm
-shadow-utils
-sssd-client
-util-linux
+util-linux-core
 -kernel
 -dosfstools
 -e2fsprogs
@@ -49,6 +49,10 @@ util-linux
 -trousers
 -xkeyboard-config
 -grubby
+-langpacks-en_GB
+# https://bugzilla.redhat.com/show_bug.cgi?id=1951111
+-util-linux
+-sssd-client
 
 %end
 
@@ -65,7 +69,13 @@ 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}')
+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
@@ -74,4 +84,6 @@ echo "# fstab intentionally empty for containers" > /etc/fstab
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+echo "# resolv placeholder" > /etc/resolv.conf
+chmod 644 /etc/resolv.conf
 %end

fedora-container-toolbox.ks

@@ -0,0 +1,225 @@
+# Kickstart file for Fedora Toolbox
+
+# See fedora-container-common.ks for details on how to hack on container image kickstarts
+
+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
+
+# Install packages
+%packages --nocore
+acl
+bash
+bash-completion
+bc
+bzip2
+coreutils
+coreutils-common
+curl
+default-editor
+diffutils
+dnf5
+dnf5-plugins
+-dosfstools
+-e2fsprogs
+fedora-release-toolbx
+findutils
+flatpak-spawn
+fpaste
+-fuse-libs
+gawk
+git
+-glibc-minimal-langpack
+glibc-all-langpacks
+gnupg2
+gnupg2-smime
+grep
+-grubby
+gvfs-client
+gzip
+hostname
+iproute
+iputils
+-kernel
+keyutils
+krb5-libs
+less
+libcap
+-libss
+lsof
+man-db
+man-pages
+mesa-dri-drivers
+mesa-vulkan-drivers
+mtr
+nss-mdns
+openssh-clients
+openssl
+p11-kit
+pam
+pigz
+-pinentry
+procps-ng
+psmisc
+python3
+rootfiles
+rpm
+rsync
+sed
+shadow-utils
+-shared-mime-info
+-sssd-client
+sudo
+# This is a weak dependency of systemd, we do not want
+# this in the container; see
+#  https://github.com/containers/toolbox/issues/1410
+-systemd-resolved
+tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
+tcpdump
+time
+traceroute
+tree
+-trousers
+tzdata
+unzip
+util-linux
+util-linux-core
+vim-minimal
+vte-profile
+vulkan-loader
+wget2-wget
+which
+whois
+words
+-xkeyboard-config
+xorg-x11-xauth
+xz
+zip
+%end
+
+# Pre-installation commands
+%pre
+# Copy README.md
+cp /README.md /mnt/sysimage/README.md
+
+# Remove macros.image-language-conf file
+rm -f /mnt/sysimage/etc/rpm/macros.image-language-conf
+
+# Remove 'tsflags=nodocs' line from dnf.conf
+sed -i '/tsflags=nodocs/d' /mnt/sysimage/etc/dnf/dnf.conf
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+set -eux
+
+# 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
+
+# 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/*
+
+# Check if specified files exist
+declare -a files=(
+ # bash
+ "/usr/share/man/man1/bash.1*"
+ "/usr/share/man/man1/cd.1*"
+ "/usr/share/man/man1/export.1*"
+ # coreutils-common
+ "/usr/share/man/man1/cat.1*"
+ "/usr/share/man/man1/cp.1*"
+ "/usr/share/man/man1/ls.1*"
+ # gnupg2
+ "/usr/share/man/man1/gpg2.1*"
+ "/usr/share/man/man7/gnupg2.7*"
+ # psmisc
+ "/usr/share/man/fr/man1/pstree.1*"
+ "/usr/share/man/ko/man1/pstree.1*"
+ "/usr/share/man/man1/pstree.1*"
+ # rpm
+ "/usr/share/man/man8/rpm.8*"
+ "/usr/share/man/man8/rpm2cpio.8*"
+ # shadow-utils
+ "/usr/share/man/fr/man8/useradd.8*"
+ "/usr/share/man/ja/man8/useradd.8*"
+ "/usr/share/man/man8/useradd.8*"
+ # util-linux
+ "/usr/share/man/man1/cal.1.*"
+ "/usr/share/man/man1/getopt.1*"
+ "/usr/share/man/man1/hexdump.1*"
+ # util-linux-core
+ "/usr/share/man/man1/kill.1*"
+ "/usr/share/man/man8/mount.8*"
+ # xz
+ "/usr/share/man/fr/man1/xz.1*"
+ "/usr/share/man/ko/man1/xz.1*"
+ "/usr/share/man/man1/xz.1*"
+)
+
+ret_val=0
+for file in "${files[@]}"; do
+ if ! compgen -G "$file" >/dev/null; then
+   echo "$file: No such file or directory" >&2
+   ret_val=1
+   break
+ fi
+done
+
+if [ "$ret_val" -ne 0 ]; then
+ false
+fi
+%end
+
+# Perform any necessary post-installation configurations specific to Fedora Toolbox (nochroot environment)
+# Post-installation commands
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# Clean up dnf cache
+dnf clean all
+
+%end

fedora-design-suite-common.ks

@@ -4,18 +4,14 @@
 
 # Identify as Fedora Design Suite
 fedora-release-designsuite
-fedora-release-identity-designsuite
--fedora-release-workstation
 
 # Provides backup application
-deja-dup
-deja-dup-nautilus
+#deja-dup
 
 # Add extra gnome applications
-gnome-books
+#gnome-books
 gnome-calendar
-gnome-photos
-gnome-shell-extension-pomodoro
+gnome-pomodoro
 gnome-todo
 
 # Add cosmetic for terminal
@@ -24,11 +20,9 @@ powerline-fonts
 
 # removal of unneeded applications
 -gnome-boxes
--eog
 
 # temporarily removing conflicting application
 -mypaint
 -sparkleshare
--blender-luxcorerender
 
 %end

fedora-disk-base.ks

@@ -57,40 +57,37 @@ glibc-all-langpacks
 
 # Find the architecture we are on
 arch=$(uname -m)
-
 # Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
+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
 
 # The enp1s0 interface is a left over from the imagefactory install, clean this up
-rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
 
 dnf -y remove dracut-config-generic
 
-# Disable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network off
-
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
 touch /etc/machine-id
 
+# 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

@@ -0,0 +1,5 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-budgie-common.ks
+
+autopart --type=btrfs --noswap

fedora-disk-kde.ks

@@ -2,16 +2,4 @@
 %include fedora-disk-xbase.ks
 %include fedora-kde-common.ks
 
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap
-
-%packages
-
-%end
-
-%post
-
-%end

fedora-disk-lxqt.ks

@@ -0,0 +1,5 @@
+%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

@@ -0,0 +1,5 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-phosh-common.ks
+
+autopart --type=btrfs --noswap

fedora-disk-python-classroom.ks

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

@@ -26,8 +26,7 @@ fedora-release-server
 
 # 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
+systemctl set-default multi-user.target
 echo .
 
 %end

fedora-disk-soas.ks

@@ -0,0 +1,5 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-soas-common.ks
+
+autopart --type=btrfs --noswap

fedora-disk-workstation.ks

@@ -2,18 +2,12 @@
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks
 
-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap
 
 %packages
 -initial-setup
 -initial-setup-gui
-
-%end
-
-%post
+gnome-initial-setup
+anaconda-webui
 
 %end

fedora-disk-xbase.ks

@@ -5,6 +5,7 @@
 @multimedia
 @printing
 -@guest-desktop-agents
+initial-setup-gui
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
@@ -16,6 +17,6 @@ glibc-all-langpacks
 
 %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
+systemctl set-default graphical.target
 
 %end

fedora-disk-xfce.ks

@@ -2,16 +2,4 @@
 %include fedora-disk-xbase.ks
 %include fedora-xfce-common.ks
 
-bootloader --append="cma=192MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap
-
-%packages
-
-%end
-
-%post
-
-%end

fedora-eln-container-base.ks

@@ -1,78 +1,27 @@
 # 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
 
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-bootloader --disabled
-timezone --isUtc --nontp Etc/UTC
-rootpw --lock --iscrypted locked
-keyboard us
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-# boot partitions are irrelevant as the final docker image is a tarball
-zerombr
-clearpart --all
-autopart --noboot --nohome --noswap --nolvm
+%include fedora-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+-fedora-release-container
 fedora-release-eln
-dnf-plugins-core
 fedora-repos-eln
-bash
-coreutils
-glibc-minimal-langpack
-rpm
-shadow-utils
-sssd-client
-util-linux
--kernel
--dosfstools
--e2fsprogs
--fuse-libs
--gnupg2-smime
--libss # used by e2fsprogs
--pinentry
--shared-mime-info
--trousers
--xkeyboard-config
--grubby
-
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
-dnf
-yum  # DNF compatibility with yum
-sssd-client
+
+dnf5
+dnf5-plugins
+
 sudo
 -glibc-langpack-en
--cracklib-dicts
 -langpacks-en
 %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"
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-33-primary /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-primary
-
-# Disable conflicting repositories.
-dnf config-manager --disable "*rawhide*" "*cisco*"
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
 rm -rf /tmp/*
@@ -93,6 +42,7 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 #   [/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/*

fedora-eln-guest.ks

@@ -9,7 +9,6 @@ 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"
-auth --enableshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=ssh
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -33,11 +32,10 @@ reboot
 # Packages
 %packages
 @core
-dnf
+dnf5
 kernel
 yum
 nfs-utils
-dnf-utils
 
 # pull firmware packages out
 -aic94xx-firmware
@@ -114,21 +112,15 @@ subscription-manager-cockpit
 
 # rh-amazon-rhui-client
 
-# Exclude all langpacks for now
--langpacks-*
-
-# The langpacks-en package is pulled in by Anaconda and it seems filtering
-# it out using langpacks-* is not sufficient. It needs to be filtered
-# directly.
--langpacks-en
+# Transitively required by grub2-tools-extra
+langpacks-core-font-en
 
 # We are building Fedora-ELN
-fedora-release
-fedora-repos
+fedora-release-eln
+fedora-repos-eln
 
 # Add rng-tools as source of entropy
-# TODO: Not available in Fedora-ELN yet.
-# rng-tools
+rng-tools
 
 %end
 
@@ -143,8 +135,7 @@ 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
+systemctl set-default multi-user.target
 echo .
 
 # this is installed by default but we don't need it in virt
@@ -162,18 +153,11 @@ echo -n "Getty fixes"
 sed -i '/^#NAutoVTs=.*/ a\
 NAutoVTs=0' /etc/systemd/logind.conf
 
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
 # For cloud images, 'eth0' _is_ the predictable device name, since
 # we don't want to be tied to specific virtual (!) hardware
 rm -f /etc/udev/rules.d/70*
 ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-rm -f /etc/sysconfig/network-scripts/ifcfg-*
+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"

fedora-i3-common.ks

@@ -0,0 +1,37 @@
+# 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
+wget2-wget
+# Better more popular browser
+system-config-printer
+# Install XFCE polkit
+xfce-polkit
+
+# save some space
+-autofs
+-acpid
+-gimp-help
+-desktop-backgrounds-basic
+-aspell-*                   # dictionaries are big
+
+%end

fedora-iot.ks

@@ -1,99 +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,rngd
-
-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)
-if [[ $arch == "armv7l" ]]; then
-	arch="armhfp"
-fi
-
-# Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
-if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
-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.)"
-
-# For trac ticket https://pagure.io/atomic-wg/issue/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-*
-
-# 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

@@ -6,57 +6,45 @@
 @firefox
 @kde-apps
 @kde-media
-@kde-office
+@kde-pim
+# Ensure we have Anaconda initial setup using kwin
+@kde-spin-initial-setup
+@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
+
+# Not needed on desktops. See: https://pagure.io/fedora-kde/SIG/issue/566
+-mariadb-server-utils
+
 ### The KDE-Desktop
 
-### Browser
-falkon
+# fedora-specific packages
+plasma-welcome-fedora
 
 ### 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-connector-c
-mariadb-server
-
 # minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
 kde-l10n
 
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
--desktop-backgrounds-basic
--kdeaccessibility*
-#-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
 mediawriter
 
 ### space issues
-
-# 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
+-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
 

fedora-kde-minimization.ks

@@ -1,8 +0,0 @@
-# remove input methods to free space
-%packages
--@input-methods
--scim*
--iok
-%end
-
-

fedora-live-astronomy_kde.ks

@@ -13,12 +13,14 @@
 
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix
+# Co-Maintainer: JT Pennington <q5sys@fedoraproject.org>
+#             https://fedoraproject.org/wiki/User:q5sys
 
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 
 # The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 14500
+part / --size 16000
 
 %packages
 
@@ -33,28 +35,24 @@ part / --size 14500
 astrometry
 astrometry-tycho2
 cdsclient
-fpack
+cfitsio-utils
 psfex
 scamp
 sextractor
-siril
+#siril
 skyviewer
 swarp
 wcstools
 
-# Observatory: KStars + INDI drivers
-indi-aagcloudwatcher
-indi-apogee
-indi-eqmod
-indi-gphoto
-indi-sx
+# Observatory: KStars + INDI
 indistarter
 kstars
+libindi
 
 # misc. astronomy
 #celestia
 stellarium
-virtualplanet
+#virtualplanet
 
 # Some astro environment stuff
 astronomy-menus
@@ -82,11 +80,9 @@ astropy-tools
 ginga
 python3-astropy
 python3-astroML
-python3-astroML-addons
 python3-astroquery
 python3-astroscrappy
 python3-APLpy
-python3-ATpy
 python3-ccdproc
 python3-fitsio
 python3-gatspy
@@ -94,25 +90,23 @@ python3-photutils
 python3-pyvo
 python3-reproject
 python3-sep
-python3-wcsaxes
 
 # matplotlib backends
-python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk
 
 
 # Python IDE very useful for scientific use
-python3-spyder
+# FTI with Python 3.12:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
+# can be restored when that is fixed
+#python3-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
 
@@ -122,17 +116,18 @@ gimp
 kst
 kst-docs
 kst-fits
-LabPlot
+# LabPlot currently not installable due to #2044284
+#LabPlot
 
 #Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
 ImageMagick
 kate
 kate-plugins
 rlwrap
 screen
-plasma-applet-redshift-control
+
+# Java JRE for VO tools
+java
 
 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*

fedora-live-base.ks

@@ -30,14 +30,7 @@ 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+
-@x86-baremetal-tools # memtest86+ is included
-
 # The point of a live image is to install
-anaconda
 anaconda-install-env-deps
 anaconda-live
 @anaconda-tools
@@ -45,239 +38,25 @@ anaconda-live
 # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
 -fcoe-utils
 -device-mapper-multipath
+-sdubby
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-# syslinux is in @x86-baremetal-tools
 
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
 
-# no longer in @core since 2018-10, but needed for livesys script
-initscripts
-chkconfig
+# provide the livesys scripts
+livesys-scripts
 %end
 
 %post
-# 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 chronyd
-### 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=}
-    continue
-  fi
-  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
-    livedir=\${arg##live_dir=}
-  fi
-done
-
-# enable swapfile if it exists
-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=}
-    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 liveuser 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 || :
-
-# turn off abrtd on a live image
-systemctl --no-reload disable abrtd.service 2> /dev/null || :
-systemctl stop abrtd.service 2> /dev/null || :
-
-# Don't sync the system clock when running live (RHBZ #1018162)
-sed -i 's/rtcsync//' /etc/chrony.conf
-
-# Mark things as configured
-touch /.liveimg-configured
-
-# add static hostname to work around xauth bug
-# https://bugzilla.redhat.com/show_bug.cgi?id=679486
-# the hostname must be something else than 'localhost'
-# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-hostnamectl set-hostname "localhost-live"
-
-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 livesys services
+systemctl enable livesys.service
+systemctl enable livesys-late.service
 
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
@@ -317,7 +96,7 @@ rm -f /boot/*-rescue*
 
 # Disable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
-/sbin/chkconfig network off
+systemctl disable network
 
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
@@ -325,17 +104,3 @@ touch /etc/machine-id
 
 %end
 
-
-%post --nochroot
-# For livecd-creator builds only (lorax/livemedia-creator handles this directly)
-if [ -n "$LIVE_ROOT" ]; then
-    cp "$INSTALL_ROOT"/usr/share/licenses/*-release-common/* "$LIVE_ROOT/"
-
-    # only installed on x86, x86_64
-    if [ -f /usr/bin/livecd-iso-to-disk ]; then
-        mkdir -p "$LIVE_ROOT/LiveOS"
-        cp /usr/bin/livecd-iso-to-disk "$LIVE_ROOT/LiveOS"
-    fi
-fi
-
-%end

fedora-live-budgie.ks

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

@@ -9,7 +9,7 @@
 %include fedora-live-base.ks
 %include fedora-cinnamon-common.ks
 
-part / --size=8192
+part / --size=9216
 
 %post
 # cinnamon configuration
@@ -21,32 +21,8 @@ PREFERRED=/usr/bin/cinnamon-session
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Cinnamon as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
-
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
-# 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
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys
 
 %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://fedoraproject.org/wiki/SIGs/NeuroFedora
-# 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

@@ -12,9 +12,6 @@
 part / --size 14336
 
 %post
-#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']/" /etc/rc.d/init.d/livesys
-
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -65,6 +62,9 @@ if [ -f `which powerline-daemon` ]; then
 fi
 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']/" /etc/rc.d/init.d/livesys
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 

fedora-live-games.ks

@@ -1,9 +1,12 @@
 # fedora-live-games.ks
 #
-# Maintainer:
+# Maintainers:
 # - Darryl T. Agostinelli <dagostinelli@gmail.com>
 #   https://fedoraproject.org/wiki/User:Dagostinelli
 #
+# - Richard Anaya <richard.anaya@gmail.com>
+#   https://fedoraproject.org/wiki/User:Richardanaya
+#
 # Former Maintainers:
 # - Bruno Wolff III <bruno@wolff.to>
 #   https://fedoraproject.org/wiki/User:Bruno
@@ -14,8 +17,7 @@
 
 %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 15360
 
 %packages
 
@@ -24,8 +26,7 @@ part / --size 14336
 
 -wine
 
-# Remove libreoffice since it just got added to livecd-desktop and
-# will likely put the games spin over size and it is freeze time.
+# Remove libreoffice, we're here to have fun!
 -libreoffice*
 
 # Extra screensavers isn't much help for the games spin
@@ -43,23 +44,17 @@ armacycles-ad
 asc
 asc-music
 astromenace
-# beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 bzflag
 crossfire-client
 extremetuxracer
-# flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
 freedroidrpg
 frozen-bubble
-gl-117
 # glob2 - currently broken
 lincity-ng
-#tmw - currently broken
-#maniadrive - currently broken
-#maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
@@ -97,7 +92,6 @@ knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
 lordsawar
-# lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
@@ -105,7 +99,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-# rogue # recently abandoned. Someone picked it up. Waiting for approval.
+rogue
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 solarwolf
 sopwith

fedora-live-i3.ks

@@ -0,0 +1,42 @@
+# 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
+
+# need a bigger /
+part / --size 6000
+
+%post
+# i3 configuration
+
+# create /etc/sysconfig/desktop (needed for installation)
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/i3
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2240823
+cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Name=xfce-polkit
+Exec=/usr/libexec/xfce-polkit
+EOF
+
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys
+
+%end
+

fedora-live-jam_kde.ks

@@ -7,12 +7,12 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 
-# Maintainer: Erich Eickmeyer <erich@ericheickmeyer.com>
+# Maintainer: JT Pennington (q5sys) <jt@obs-sec.com>
 
 %include fedora-live-kde.ks
 
 # DVD size partition
-part / --size 10240 --fstype ext4
+part / --size 11264 --fstype ext4
 
 #enable threaded irqs
 bootloader --append="threadirqs"
@@ -63,22 +63,20 @@ thunderbird
 
 %post
 
+# Override livesys-kde settings
+cat >> /var/lib/livesys/livesys-session-extra << EOF
+
 #setup kickoff favorites
 /bin/mkdir -p /etc/skel/.config
 
 JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/studio-controls.desktop,/usr/share/applications/ardour6.desktop,/usr/share/applications/carla.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
-cat <<EOF  >> /etc/skel/.config/kickoffrc
+cat <<FOE  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
-EOF
+FOE
 
-# 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

@@ -19,68 +19,7 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF
 gtk-theme-name = Adwaita
 EOF
 
-# add initscript
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up autologin for user liveuser
-if [ -f /etc/sddm.conf ]; then
-sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
-else
-cat > /etc/sddm.conf << SDDM_EOF
-[Autologin]
-User=liveuser
-Session=plasma.desktop
-SDDM_EOF
-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 (bz #1436873 and 1206760)
-echo "Removing plasma-pk-updates package."
-rpm -e plasma-pk-updates
-
-# 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
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys
 
 %end

fedora-live-kde.ks

@@ -9,10 +9,9 @@
 
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
-%include fedora-kde-minimization.ks
 
 # DVD payload
-part / --size=7000
+part / --size=9000
 
 %post
 %end

fedora-live-lxde.ks

@@ -10,6 +10,9 @@
 %include fedora-live-minimization.ks
 %include fedora-lxde-common.ks
 
+# increate the disk size for compose
+part / --size 7168
+
 %post
 # LXDE and LXDM configuration
 
@@ -19,46 +22,8 @@ PREFERRED=/usr/bin/startlxde
 DISPLAYMANAGER=/usr/sbin/lxdm
 EOF
 
-cat >> /etc/rc.d/init.d/livesys << EOF
-# disable screensaver locking and make sure gamin gets started
-cat > /etc/xdg/lxsession/LXDE/autostart << FOE
-/usr/libexec/gam_server
-@lxpanel --profile LXDE
-@pcmanfm --desktop --profile LXDE
-/usr/libexec/notification-daemon
-FOE
-
-# set up preferred apps 
-cat > /etc/xdg/libfm/pref-apps.conf << FOE 
-[Preferred Applications]
-WebBrowser=firefox.desktop
-MailClient=sylpheed.desktop
-FOE
-
-# set up auto-login for liveuser
-sed -i 's/# autologin=.*/autologin=liveuser/g' /etc/lxdm/lxdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# create default config for clipit, otherwise it displays a dialog on startup
-mkdir -p /home/liveuser/.config/clipit
-cat > /home/liveuser/.config/clipit/clipitrc  << FOE
-[rc]
-use_copy=true
-save_uris=true
-save_history=false
-statics_show=true
-single_line=true
-FOE
-
-# this goes at the end after all other changes.
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="lxde"/' /etc/sysconfig/livesys
 
 %end
 

fedora-live-lxqt.ks

@@ -11,47 +11,16 @@
 %include fedora-live-minimization.ks
 %include fedora-lxqt-common.ks
 
+# need a bigger /
+part / --size 6000
+
 %packages
 dracut-config-generic
 %end
 
 %post
-# add initscript
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-# set up autologin for user liveuser
-if [ -f /etc/sddm.conf ]; then
-sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=lxqt.desktop/' /etc/sddm.conf
-else
-cat > /etc/sddm.conf << SDDM_EOF
-[Autologin]
-User=liveuser
-Session=lxqt.desktop
-SDDM_EOF
-fi
-
-# show liveinst.desktop on desktop and in menu
-sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
-
-# set up preferred apps 
-cat > /etc/xdg/libfm/pref-apps.conf << FOE 
-[Preferred Applications]
-WebBrowser=qupzilla.desktop
-FOE
-
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
-dnf -y remove dracut-config-generic
-
-# make sure to set the right permissions and selinux contexts
-chown -R liveuser:liveuser /home/liveuser/
-restorecon -R /home/liveuser/
-
-EOF
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="lxqt"/' /etc/sysconfig/livesys
 
 %end
 

fedora-live-mate_compiz.ks

@@ -7,45 +7,10 @@
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
-part / --size 8192
+part / --size 9216
 
 %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
-
-# and mark it as executable
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# rebuild schema cache with any overrides we installed
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-# 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
-
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
-
-# make sure to set the right permissions and selinux contexts
-chown -R liveuser:liveuser /home/liveuser/
-restorecon -R /home/liveuser/
-EOF
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys
 
 %end

fedora-live-minimization.ks

@@ -4,13 +4,6 @@
 %packages
 
 # save some space
--mpage
 -hplip
--isdn4k-utils
-
-# scanning takes quite a bit of space :/
--xsane
--xsane-gimp
--sane-backends
 
 %end

fedora-live-miraclewm.ks

@@ -0,0 +1,30 @@
+# fedora-livecd-miraclewm.ks
+#
+# Description:
+# - Fedora Live Spin with the tiling window manager Miracle
+#
+# Maintainer(s):
+# - Matthew Kosarek <mattkae@fedoraproject.org>
+# - Neal Gompa      <ngompa@fedoraproject.org>
+
+%include fedora-live-base.ks
+%include fedora-live-minimization.ks
+%include fedora-miraclewm-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/miraclewm
+DISPLAYMANAGER=/bin/sddm
+EOF
+
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="miraclewm"/' /etc/sysconfig/livesys
+
+%end
+

fedora-live-robotics.ks

@@ -1,5 +1,6 @@
-# Maintained by the Fedora Robotics SIG:
-# http://fedoraproject.org/wiki/SIGs/Robotics
+# Maintained by lrossett and the Fedora Robotics SIG:
+# https://docs.fedoraproject.org/en-US/robotics-sig/
+# mailto:lrossett@redhat.com
 # mailto:robotics@lists.fedoraproject.org
 
 %include fedora-live-base.ks
@@ -15,10 +16,6 @@ part / --size 10752
 
 # Add robotics development packages
 @robotics-suite
-pcl-devel
-player-devel
-stage-devel
-mrpt-devel
 
 # Add version control packages
 git
@@ -59,7 +56,6 @@ mercurial
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras
@@ -90,9 +86,9 @@ mercurial
 
 %end
 
-# Rip the post-configuration from the live-desktop, set default shortcuts to IDEs 
 %post
-cat >> /etc/rc.d/init.d/livesys << EOF
+# Extend the post-configuration from the live-desktop, set default shortcuts to IDEs
+cat >> /var/lib/livesys/livesys-session-extra << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
@@ -105,12 +101,6 @@ 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
@@ -128,17 +118,5 @@ 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

@@ -12,8 +12,7 @@
 %include fedora-live-minimization.ks
 %include fedora-scientific-common.ks
 
-# The recommended part size for DVDs is too close to use for the scientific spin
-part / --size 15000
+part / --size 18000
 
 %post
 

fedora-live-security.ks

@@ -6,6 +6,7 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
+#   JT Pennington <jt [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
 #   many thanks, especially to Christoph Wickert!
@@ -44,6 +45,7 @@ gnome-keyring-pam
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
+-default-fonts-core-math
 -ibus-typing-booster
 -xfce4-sensors-plugin
 -man-pages-*
@@ -59,7 +61,6 @@ gnome-keyring-pam
 -binwalk
 -bkhive
 -bonesi
--bro
 -cmospwd
 -dnstop
 -etherape
@@ -77,7 +78,6 @@ gnome-keyring-pam
 -pdfcrack
 -proxychains
 -pyrit
--raddump
 -rkhunter
 -safecopy
 -samdump2
@@ -101,50 +101,7 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-mkdir -p /home/liveuser/.config/xfce4
-
-cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
-MailReader=sylpheed-claws
-FileManager=Thunar
-WebBrowser=midori
-FOE
-
-# disable screensaver locking (#674410)
-cat >> /home/liveuser/.xscreensaver << FOE
-mode:           off
-lock:           False
-dpmsEnabled:    False
-FOE
-
-# deactivate xfconf-migration (#683161)
-rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
-
-# deactivate xfce4-panel first-run dialog (#693569)
-mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
-cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Xfce as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
-
-# Show harddisk install on the desktop
-sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-mkdir /home/liveuser/Desktop
-cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
-
-# and mark it as executable (new Xfce security feature)
-chmod +x /home/liveuser/Desktop/liveinst.desktop
-
-# this goes at the end after all other changes. 
-chown -R liveuser:liveuser /home/liveuser
-restorecon -R /home/liveuser
-
-EOF
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
 
 %end

fedora-live-soas.ks

@@ -4,7 +4,8 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org>
+# - Alex Perez <aperez AT alexperez DOT com>
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
@@ -12,37 +13,15 @@
 
 %post
 
-cat >> /etc/rc.d/init.d/livesys << EOF
-# set up lightdm autologin
-sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
-sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
-#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
-
-# set Sugar as default session, otherwise login will fail
-sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2239137
+cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Name=xfce-polkit
+Exec=/usr/libexec/xfce-polkit
 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
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
 
 %end

fedora-live-sway.ks

@@ -0,0 +1,34 @@
+# 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
+
+part / --size 6144
+
+%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

@@ -10,87 +10,16 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 7680
+part / --size 8576
+
+%packages
+gnome-initial-setup
+anaconda-webui
+%end
 
 %post
 
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-
-# disable gnome-software automatically downloading updates
-cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
-[org.gnome.software]
-download-updates=false
-FOE
-
-# don't autostart gnome-software session service
-rm -f /etc/xdg/autostart/gnome-software-service.desktop
-
-# disable the gnome-software shell search provider
-cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE
-DefaultDisabled=true
-FOE
-
-# don't run gnome-initial-setup
-mkdir ~liveuser/.config
-touch ~liveuser/.config/gnome-initial-setup-done
-
-# suppress anaconda spokes redundant with gnome-initial-setup
-cat >> /etc/sysconfig/anaconda << FOE
-[NetworkSpoke]
-visited=1
-
-[PasswordSpoke]
-visited=1
-
-[UserSpoke]
-visited=1
-FOE
-
-# 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', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.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
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
 
 %end

fedora-live-xfce.ks

@@ -26,54 +26,8 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-mkdir -p /home/liveuser/.config/xfce4
-
-cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
-MailReader=sylpheed-claws
-FileManager=Thunar
-WebBrowser=firefox
-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
-
-# no updater applet in live environment
-rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.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
+# set livesys session type
+sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
 
 %end
 

fedora-lxde-common.ks

@@ -15,9 +15,6 @@
 @lxde-media
 @lxde-office
 
-# FIXME: can be omitted once comps is updated
-midori
-
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
 
@@ -49,6 +46,7 @@ metacity
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
+-default-fonts-core-math
 -ibus-typing-booster
 -xscreensaver-extras
 #-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps

fedora-minimal-common.ks

@@ -1,25 +0,0 @@
-%packages
-microdnf
--@standard
--initial-setup-gui
--generic-release*
--glibc-all-langpacks
--xkeyboard-config
-# 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-miraclewm-common.ks

@@ -0,0 +1,15 @@
+# fedora-livecd-miraclewm.ks
+#
+# Description:
+# - Fedora Live Spin with the tiling window manager Miracle
+#
+# Maintainer(s):
+# - Matthew Kosarek <mattkae@fedoraproject.org>
+# - Neal Gompa      <ngompa@fedoraproject.org>
+
+%packages
+fedora-release-miraclewm
+@^miraclewm-desktop-environment
+@firefox
+initial-setup-gui-wayland-miraclewm
+%end

fedora-modular-arm-server.ks

@@ -1,27 +0,0 @@
-%include fedora-arm-base.ks
-
-# server defaults to xfs for / so lets do so on arm also
-part / --size=2500 --fstype xfs
-
-%packages
-# install the default groups for the server evironment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@container-management
-@domain-client
--initial-setup-gui
--generic-release*
-fedora-modular-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-modular-disk-minimal.ks

@@ -31,7 +31,7 @@ coreutils-single
 util-linux
 rpm
 shadow-utils
-microdnf
+dnf5
 glibc-minimal-langpack
 grubby
 kernel
@@ -56,17 +56,9 @@ sssd-client
 
 # Find the architecture we are on
 arch=$(uname -m)
-
 # Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
+cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 fi
 
 releasever=$(rpm --eval '%{fedora}')

fedora-neuro-gnome-common.ks

@@ -1,30 +0,0 @@
-# Description: Common gnome based configuration for NeuroFedora spin images.
-#
-# Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
-# 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

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

@@ -10,7 +10,7 @@
 nano
 openssh-clients
 vim-enhanced
-wget
+wget2-wget
 
 # Remove Pythons possibly recommended by tox
 -python2
@@ -27,7 +27,12 @@ wget
 -python3.6
 -python3.7
 -python3.8
+-python3.9
+-python3.10
+-python3.11
+-python3.12
 -pypy
+-pypy3.9
 
 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
 #               and https://bugzilla.redhat.com/show_bug.cgi?id=1902354

fedora-python-classroom-gnome-common.ks

@@ -35,6 +35,9 @@ python3-pillow-tk
 # This is no longer workstation
 -@workstation-product
 
+# But we want to keep the Fedora desktop backgrounds
+desktop-backgrounds-gnome
+
 # Add a web browser
 @firefox
 
@@ -45,7 +48,7 @@ python3-pillow-tk
 
 # Drop the Java plugin and Java
 -icedtea-web
--java*
+-*openjdk*
 
 # No printing
 -@printing
@@ -58,7 +61,6 @@ python3-pillow-tk
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -desktop-backgrounds-basic
 -*backgrounds-extras
 

fedora-scientific-common.ks

@@ -43,7 +43,7 @@ python3-networkx
 python3-pandas
 
 # matplotlib backends
-python3-matplotlib-qt4
+python3-matplotlib-qt5
 python3-matplotlib-tk
 
 # Include Java development tools
@@ -61,13 +61,10 @@ julia
 julia-doc
 julia-devel
 
-# IDEs for the IDE folks
-@eclipse
-
-# Workaround for https://pagure.io/releng/issue/7814
--eclipse-linuxtools-vagrant
-
-python3-spyder
+# FTI with Python 3.12:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
+# can be restored when that is fixed
+#python3-spyder
 python3-spyder-kernels
 
 
@@ -139,7 +136,6 @@ tmux
 rlwrap
 hexchat
 fig2ps
-bibtex2html
 hevea
 
 #Include Mozilla Firefox

fedora-server-vm-full.ks

@@ -0,0 +1,204 @@
+# fedora-server-vm-full.ks (rel. 1.02)
+# 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
+
+# Trigger lvm-devices-import.path and .service to create
+# a new /etc/lvm/devices/system.devices for the root VG.
+rm -f /etc/lvm/devices/system.devices
+touch /etc/lvm/devices/auto-import-rootvg
+
+# 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
+
+# When we build the image /var/log gets populated.
+# Let's clean it up.
+echo "Cleanup leftover in /var/log"
+cd /var/log  && find . -name \* -type f -delete 
+
+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"
+systemctl set-default multi-user.target
+echo .
+
+%end
+##### end custom post script ########################################

fedora-soas-common.ks

@@ -4,7 +4,8 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org>
+# - Alex Perez <aperez AT alexperez DOT com>
 
 firewall --enabled --service=mdns,presence
 
@@ -64,6 +65,9 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 
+# Install XFCE polkit
+xfce-polkit
+
 %end
 
 %post
@@ -77,7 +81,8 @@ 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
-dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+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*
@@ -104,6 +109,18 @@ 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-sway-common.ks

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

fedora-workstation-common.ks

@@ -12,4 +12,7 @@
 -gfs2-utils
 -reiserfs-utils
 
+# Exclude extra unwanted packages
+-python3-botocore
+
 %end

fedora-xfce-common.ks

@@ -19,7 +19,7 @@ fedora-release-xfce
 @xfce-media
 @xfce-office
 
-wget
+wget2-wget
 system-config-printer
 
 # save some space

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -26,7 +26,7 @@ imsettings
 %end
 
 %post
-cat >> /etc/rc.d/init.d/livesys << EOF
+cat >> /var/lib/livesys/livesys-session-extra << EOF
 #### setting env and start ibus-deamon ####
 #mkdir /home/liveuser
 cat >> /home/liveuser/.bash_profile << FOE

maintainers.toml

@@ -1,9 +1,9 @@
 [spins.lxqt.x86_64]
-fas = [ "lupinix", "zsun" ]
-maintainers = [ "Christian Dersch", "Zamir SUN" ]
+fas = [ "lupinix", "zsun", "farchord", "ngompa" ]
+maintainers = [ "Christian Dersch", "Zamir SUN", "Steve Cossette", "Neal Gompa" ]
 [spins.lxqt.armhfp]
-fas = [ "lupinix", "zsun" ]
-maintainers = [ "Christian Dersch", "Zamir SUN" ]
+fas = [ "lupinix", "zsun", "farchord", "ngompa" ]
+maintainers = [ "Christian Dersch", "Zamir SUN", "Steve Cossette", "Neal Gompa" ]
 
 [spins.xfce.x86_64]
 fas = [ "nonamedotc", "kevin", "maxamillion" ]
@@ -13,13 +13,17 @@ fas = [ "nonamedotc", "kevin", "maxamillion" ]
 maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ]
 
 [spins.kde.x86_64]
-fas = [ "rdieter", "svahl" ]
-maintainers = [ "Rex Dieter", "Sebastian Vahl" ]
+fas = [ "rdieter", "marcdeop", "ngompa" ]
+maintainers = [ "Rex Dieter", "Marc Deop", "Neal Gompa" ]
 
 [spins.cinnamon.x86_64]
 fas = [ "grinnz" ]
 maintainers = [ "Dan Book" ]
 
+[spins.mate_compiz.x86_64]
+fas = [ "raveit65" ]
+maintainers = [ "Wolfgang Ulbrich" ]
+
 [spins.lxde.x86_64]
 fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
@@ -28,35 +32,31 @@ fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
 
 [spins.soas.x86_64]
-fas = [ "chimosky", "aperezbios", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
+fas = [ "chimosky", "aperezbios" ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
 [spins.soas.armhfp]
-fas = [ "chimosky", "aperezbios", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
+fas = [ "chimosky", "aperezbios", ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
 
 [labs.astronomy_kde.x86_64]
-fas = [ "lupinix" ]
-maintainers = [ "Christian Dersch" ]
+fas = [ "lupinix", "q5sys" ]
+maintainers = [ "Christian Dersch", "JT Pennington" ]
 
 [labs.security.x86_64]
-fas = [ "fab", "jsimon" ]
-maintainers = [ "Fabian Affolter", "Joerg Simon" ]
-
-[labs.comp_neuro.x86_64]
-fas = [ "bt0dotninja", "dan1mal", "ankursinha", "neuro-sig" ]
-maintainers = [ "Alberto Rodriguez Sanchez", "Danny Lee", "Ankur Sinha", "NeuroFedora SIG" ]
+fas = [ "fab", "jsimon", "q5sys"]
+maintainers = [ "Fabian Affolter", "Joerg Simon", "JT Pennington" ]
 
 [labs.design_suite.x86_64]
 fas = [ "luya" ]
 maintainers = [ "Luya Tshimbalanga" ]
 
 [labs.games.x86_64]
-fas = [ "dagostinelli" ]
-maintainers = [ "Darryl T. Agostinelli" ]
+fas = [ "ngompa", "q5sys" ]
+maintainers = [ "Neal Gompa", "JT Pennington" ]
 
 [labs.jam_kde.x86_64]
-fas = [ "eeickmeyer" ]
-maintainers = [ "Erich Eickmeyer" ]
+fas = [ "q5sys" ]
+maintainers = [ "JT Pennington" ]
 
 [labs.python_classroom.x86_64]
 fas = [ "churchyard", "python-sig" ]
@@ -71,5 +71,53 @@ fas = [ "scitech" ]
 maintainers = [ "SciTech SIG" ]
 
 [labs.robotics.x86_64]
-fas = [ "rmattes", "robotics-sig" ]
-maintainers = [ "Rich Mattes", "Robotics SIG" ]
+fas = [ "lrossett", "robotics-sig" ]
+maintainers = [ "Leonardo Rossetti", "Robotics SIG" ]
+
+[spins.i3.x86_64]
+fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ]
+maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ]
+
+[eln]
+fas = [ "sgallagh", "tdawson", "asamalik", "yselkowitz" ]
+maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik", "Yaakov Selkowitz" ]
+
+[spins.budgie.x86_64]
+fas = [ "joshstrobl" ]
+maintainers = [ "Joshua Strobl" ]
+
+[spins.sway.x86_64]
+fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
+maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
+
+[spins.miraclewm.x86_64]
+fas = [ "mattkae", "ngompa" ]
+maintainers = [ "Matthew Kosarek", "Neal Gompa" ]
+
+[silverblue.x86_64]
+fas = [ "siosm", "tpopela" ]
+maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
+[silverblue.aarch64]
+fas = [ "siosm", "tpopela" ]
+maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
+
+[kinoite.x86_64]
+fas = [ "siosm" ]
+maintainers = [ "Timothée Ravier" ]
+[kinoite.aarch64]
+fas = [ "siosm" ]
+maintainers = [ "Timothée Ravier" ]
+
+[sericea.x86_64]
+fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
+maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
+[sericea.aarch64]
+fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
+maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
+
+[onyx.x86_64]
+fas = [ "joshstrobl" ]
+maintainers = [ "Joshua Strobl" ]
+[onyx.aarch64]
+fas = [ "joshstrobl" ]
+maintainers = [ "Joshua Strobl" ]

tools/list-packages-for-ks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # Given as input a comps definition and a .ks file, list
 # the packages which would be installed.  This list is
 # NOT depsolved, it's merely a textual list of explicitly
@@ -11,38 +11,40 @@
 import os
 import sys
 import getopt
-import xml.etree.cElementTree as ElementTree
+import xml.etree.ElementTree as ElementTree
 
 import pykickstart
 import pykickstart.parser
 import pykickstart.version
 
+
 def usage(ecode):
-    print "Usage: %s [--version=VERSION] COMPS.xml KICKSTART.ks" % (sys.argv[0], )
-    print "List packages installed by KICKSTART."
+    print("Usage: {} [--version=VERSION] COMPS.xml KICKSTART.ks".format(sys.argv[0]))
+    print("List packages installed by KICKSTART.")
     sys.exit(ecode)
 
+
 def main():
     try:
-        opts,args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
-    except getopt.GetoptError, e:
+        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
+    except getopt.GetoptError as e:
         usage(1)
-        
+
     version = None
     debug = False
-    for o,a in opts:
+    for o, a in opts:
         if o in ('-h', '--help'):
             usage(0)
-        elif o in ('--debug', ):
+        elif o in ('--debug',):
             debug = True
-        elif o in ('--version', ):
+        elif o in ('--version',):
             version = a
-        
+
     if len(args) != 2:
         usage(1)
     comps_filename = args[0]
     kickstart_filename = args[1]
-    
+
     if version:
         version_cls = pykickstart.version.stringToVersion(version)
     else:
@@ -55,10 +57,10 @@ def main():
     working_directory = os.path.dirname(kickstart_filename)
     if working_directory:
         os.chdir(working_directory)
-        
+
     parser = pykickstart.parser.KickstartParser(version_cls)
     parser.readKickstart(kickstart_filename)
-   
+
     comps_groups = comps.findall('group')
     packages_for_group = {}
     for group in comps_groups:
@@ -74,27 +76,29 @@ def main():
         packages_for_group[group_id.text] = pkglist
 
     pkg_list = set()
-   
+
     for group in parser.handler.packages.groupList:
         if debug:
-            print >>sys.stderr, "# Including %d packages from group %r" % (len(packages_for_group[group.name]), group.name)
-        for pkg in packages_for_group[group.name]:
+            print("# Including {} packages from group '{}'".format(len(packages_for_group.get(group.name, [])),
+                                                                   group.name), file=sys.stderr)
+        for pkg in packages_for_group.get(group.name, []):
             pkg_list.add(pkg)
     if debug:
-        print >>sys.stderr, "# Adding %d explicitly specified packages" % (len(parser.handler.packages.packageList), )
+        print("# Adding {} explicitly specified packages".format(len(parser.handler.packages.packageList)),
+              file=sys.stderr)
     for pkg in parser.handler.packages.packageList:
         pkg_list.add(pkg)
     if debug:
-        print >>sys.stderr, "# Processing %d explicitly excluded packages" % (len(parser.handler.packages.excludedList), )
+        print("# Processing {} explicitly excluded packages".format(len(parser.handler.packages.excludedList)),
+              file=sys.stderr)
     for pkg in parser.handler.packages.excludedList:
-        if pkg in pkg_list:
-            pkg_list.remove(pkg)
+        pkg_list.discard(pkg)
 
     for pkg in sorted(pkg_list):
-        print "%s" % (pkg, )
+        print(pkg)
 
     sys.exit(0)
 
+
 if __name__ == '__main__':
     main()
-