feat: update comp-neuro image

- make it leaner by limiting to comp neuro tools only, and removing extra analysis tools (which users can install when required) Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
Cloud: Azure support
2025-12-09 16:40:30 +08:00 · 2021-11-10 18:49:52 +00:00 · 2021-11-04 17:29:34 +01:00 · 2021-11-03 17:51:41 -07:00 · 2021-10-14 13:14:22 -05:00 · 2021-09-21 16:17:22 +02:00
60 changed files with 737 additions and 533 deletions
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -1,77 +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
-rng-tools
-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
--- a/fedora-arm-kde.ks
+++ b/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=7000
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end
--- a/fedora-arm-lxde.ks
+++ b/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
--- a/fedora-arm-lxqt.ks
+++ b/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
--- a/fedora-arm-mate.ks
+++ b/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
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,8 +0,0 @@
-%include fedora-arm-base.ks
-%include fedora-minimal-common.ks
-
-part / --size=1500 --fstype ext4
-
-%packages
-xkeyboard-config
-%end
--- a/fedora-arm-python-classroom.ks
+++ b/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
-
--- a/fedora-arm-server.ks
+++ b/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
-
--- a/fedora-arm-soas.ks
+++ b/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
--- a/fedora-arm-workstation.ks
+++ b/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
--- a/fedora-arm-xbase.ks
+++ b/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
--- a/fedora-arm-xfce.ks
+++ b/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=5200
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs / --subvol --name=root LABEL=fedora
-
-%post
-
-%end
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -9,13 +9,15 @@
 %packages

 fedora-release-cinnamon
-@networkmanager-submodules
-@cinnamon-desktop
+
+# install env-group to resolve RhBug:1891500
+@^cinnamon-desktop-environment
+
@libreoffice
 parole
 rhythmbox

 # extra backgrounds
-f33-backgrounds-extras-gnome
+f35-backgrounds-extras-gnome

 %end
--- a/fedora-cloud-base-gcp.ks
+++ b/fedora-cloud-base-gcp.ks
@@ -9,10 +9,20 @@
 # 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 net.ifnames=0 console=ttyS0,38400n8d"

-#%packages
-#%end
+# redefine `services` here to drop cloud-init systemd unit enablements from
+# fedora-cloud-base.ks since we don't use them.
+services --enabled=sshd
+
+%packages
+# GCP provides its own guest environment.
+google-compute-engine-guest-configs
+-cloud-init
+# Fedora Cloud Base includes the qemu guest agent. GCP prefers
+# that it not be installed  https://pagure.io/cloud-sig/issue/319
+-qemu-guest-agent
+%end

 %post --erroronfail
 cat <<EOF > /etc/NetworkManager/conf.d/gcp-mtu.conf
--- a/fedora-cloud-base-vagrant.ks
+++ b/fedora-cloud-base-vagrant.ks
@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --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
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -32,13 +32,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 net.ifnames=0 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=500  --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

@@ -67,16 +74,23 @@ kernel-core
 # rhgb/quiet on kernel command line
 -plymouth

+# Install qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To
+# improve the integration with OpenStack and other VM management
+# systems (oVirt, KubeVirt).
+qemu-guest-agent
+
+
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld

-# 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
 -geolite2-city
+
+# Include dependencies for cloud-init on Azure.
+gdisk
+openssl
 %end
 ##### end package list ###############################################

@@ -84,6 +98,15 @@ kernel-core
 ##### 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
@@ -104,16 +127,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

--- a/fedora-comp-neuro-common.ks
+++ b/fedora-comp-neuro-common.ks
@@ -1,48 +1,29 @@
 # Description: Packages for the NeuroFedora computational neuroscience lab image.
-# 
+#
 # Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org

 %packages
-
+fedora-release-compneuro
 # Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
@python-science

-# 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
+neuron-devel
 python3
 python3-brian2
-python-brian2-doc
 python3-ipython
+python3-lfpy
 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-pynn
 python3-steps
-smoldyn

 %end
--- a/fedora-container-base.ks
+++ b/fedora-container-base.ks
@@ -11,10 +11,8 @@ 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
 sudo
 -glibc-langpack-en
-cracklib-dicts
 -langpacks-en
 %end

--- a/fedora-container-common.ks
+++ b/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
@@ -35,8 +36,6 @@ bash
 coreutils
 glibc-minimal-langpack
 rpm
-shadow-utils
-sssd-client
 util-linux
 -kernel
 -dosfstools
@@ -49,6 +48,10 @@ util-linux
 -trousers
 -xkeyboard-config
 -grubby
+-langpacks-en_GB
+# https://bugzilla.redhat.com/show_bug.cgi?id=1951111
+-util-linux
+-sssd-client

 %end

--- a/fedora-design-suite-common.ks
+++ b/fedora-design-suite-common.ks
@@ -0,0 +1,32 @@
+%packages
+# Switch to groups for design suite
+@design-suite
+
+# Identify as Fedora Design Suite
+fedora-release-designsuite
+
+# Provides backup application
+deja-dup
+deja-dup-nautilus
+
+# Add extra gnome applications
+gnome-books
+gnome-calendar
+gnome-photos
+gnome-pomodoro
+gnome-todo
+
+# Add cosmetic for terminal
+powerline
+powerline-fonts
+
+# removal of unneeded applications
+-gnome-boxes
+-eog
+
+# temporarily removing conflicting application
+-mypaint
+-sparkleshare
+-blender-luxcorerender
+
+%end
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -34,12 +34,13 @@ firstboot --reconfig
@hardware-support

 kernel
+# on 32bit arm make sure we only install one kernel
+-kernel-lpae
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
@arm-tools
-rng-tools
 chrony
 bcm283x-firmware
 initial-setup
@@ -75,23 +76,20 @@ 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*
+
 %end
--- a/fedora-disk-kde.ks
+++ b/fedora-disk-kde.ks
@@ -0,0 +1,5 @@
+%include fedora-disk-base.ks
+%include fedora-disk-xbase.ks
+%include fedora-kde-common.ks
+
+autopart --type=btrfs --noswap
--- a/fedora-disk-minimal.ks
+++ b/fedora-disk-minimal.ks
@@ -4,7 +4,3 @@
 services --enabled=sshd,NetworkManager,chronyd,initial-setup

 autopart --type=plain --noswap
-
-%packages
-xkeyboard-config
-%end
--- a/fedora-disk-python-classroom.ks
+++ b/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
--- a/fedora-disk-soas.ks
+++ b/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
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -2,10 +2,6 @@
 %include fedora-disk-xbase.ks
 %include fedora-workstation-common.ks

-bootloader --append="cma=256MB"
-
-services --enabled=sshd,NetworkManager,chronyd
-
 autopart --type=btrfs --noswap

 %packages
@@ -13,7 +9,3 @@ autopart --type=btrfs --noswap
 -initial-setup-gui

 %end
-
-%post
-
-%end
--- a/fedora-disk-xbase.ks
+++ b/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
--- a/fedora-disk-xfce.ks
+++ b/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
--- a/fedora-eln-container-base.ks
+++ b/fedora-eln-container-base.ks
@@ -0,0 +1,111 @@
+# 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
+
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+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
+sudo
+-glibc-langpack-en
+-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/*
+
+# https://pagure.io/atomic-wg/issue/308
+printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
+
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in docker
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+#
+# We ignore the return code of the systemd-tmpfiles command because
+# at this point we have already removed the /etc/machine-id and all
+# tmpfiles lines with %m in them will fail and cause a bad return
+# code. Example failure:
+#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
+#
+umount /run
+
+# Final pruning
+rm -rfv /var/cache/* /var/log/* /tmp/*
+
+%end
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
+# NOTE: run this in nochroot because "find" does not exist in chroot
+KEEPLANG=en_US
+for dir in locale i18n; do
+    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
+done
+
+%end
--- a/fedora-eln-guest.ks
+++ b/fedora-eln-guest.ks
@@ -0,0 +1,244 @@
+# Kickstart file to build Fedora ELN Guest image.
+# This image is used to test Fedora ELN content for
+# the cloud instances. This image provides minimally configured
+# system image.
+
+text
+lang en_US.UTF-8
+keyboard us
+timezone --utc America/New_York
+# add console and reorder in %post
+bootloader --timeout=1 --location=mbr --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
+selinux --enforcing
+firewall --enabled --service=ssh
+network --bootproto=dhcp --device=link --activate --onboot=on
+#services --enabled=sshd,ovirt-guest-agent --disabled kdump,rhsmcertd
+services --enabled=sshd,NetworkManager,cloud-init,cloud-init-local,cloud-config,cloud-final --disabled kdump,rhsmcertd
+rootpw --iscrypted nope
+
+#
+# Partition Information. Change this as necessary
+# This information is used by appliance-tools but
+# not by the livecd tools.
+#
+zerombr
+clearpart --all --initlabel
+# autopart --type=plain --nohome # --nohome doesn't work because of rhbz#1509350
+# autopart is problematic in that it creates /boot and swap partitions rhbz#1542510 rhbz#1673094
+reqpart
+part / --fstype="xfs" --ondisk=vda --size=8000
+reboot
+
+# Packages
+%packages
+@core
+dnf
+kernel
+yum
+nfs-utils
+dnf-utils
+
+# pull firmware packages out
+-aic94xx-firmware
+-alsa-firmware
+-alsa-lib
+-alsa-tools-firmware
+-ivtv-firmware
+-iwl1000-firmware
+-iwl100-firmware
+-iwl105-firmware
+-iwl135-firmware
+-iwl2000-firmware
+-iwl2030-firmware
+-iwl3160-firmware
+-iwl3945-firmware
+-iwl4965-firmware
+-iwl5000-firmware
+-iwl5150-firmware
+-iwl6000-firmware
+-iwl6000g2a-firmware
+-iwl6000g2b-firmware
+-iwl6050-firmware
+-iwl7260-firmware
+-libertas-sd8686-firmware
+-libertas-sd8787-firmware
+-libertas-usb8388-firmware
+
+# cloud-init does magical things with EC2 metadata, including provisioning
+# a user account with ssh keys.
+cloud-init
+## Adding a dependency for cloud-init as recommended by tdawson
+python3-jsonschema
+
+# rhevm guest-agent (Not available in ELN yet)
+#rhevm-guest-agent-common
+
+# allows the host machine to issue commands to the guest operating system
+qemu-guest-agent
+
+# need this for growpart, because parted doesn't yet support resizepart
+# https://bugzilla.redhat.com/show_bug.cgi?id=966993
+#cloud-utils
+
+#heat-cfntools  # Not available in ELN (yet?)
+
+cloud-utils-growpart
+# We need this image to be portable; also, rescue mode isn't useful here.
+dracut-config-generic
+
+# Don't include dracut-config-rescue. It will have dracut generate a
+# "rescue" entry in the grub menu, but that also means there is a
+# rescue kernel and initramfs that get created, which (currently) add
+# about another 40MiB to the /boot/ partition. Also the "rescue" mode
+# is generally not useful in the cloud.
+-dracut-config-rescue
+
+# Needed initially, but removed below.
+firewalld
+
+# cherry-pick a few things from @base
+tar
+tcpdump
+rsync
+
+# Some things from @core we can do without in a minimal install
+-biosdevname
+-plymouth
+-iprutils
+
+# Minimal Cockpit web console
+cockpit-ws
+cockpit-system
+subscription-manager-cockpit
+
+# rh-amazon-rhui-client
+
+# Exclude all langpacks for now
+-langpacks-*
+
+# 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
+
+# We are building Fedora-ELN
+fedora-release
+fedora-repos
+
+# Add rng-tools as source of entropy
+# TODO: Not available in Fedora-ELN yet.
+# rng-tools
+
+%end
+
+#
+# Add custom post scripts after the base post.
+#
+%post --erroronfail
+
+# workaround anaconda requirements
+passwd -d root
+passwd -l root
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+# this is installed by default but we don't need it in virt
+echo "Removing linux-firmware package."
+dnf -C -y remove linux-firmware
+
+# Remove firewalld; it is required to be present for install/image building.
+echo "Removing firewalld."
+dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+echo -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+BOOTPROTOv6="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+USERCTL="yes"
+PEERDNS="yes"
+IPV6INIT="yes"
+PERSISTENT_DHCLIENT="1"
+EOF
+
+# set virtual-guest as default profile for tuned
+echo "virtual-guest" > /etc/tuned/active_profile
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+cat <<EOL > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel
+EOL
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# workaround https://bugzilla.redhat.com/show_bug.cgi?id=966888
+if ! grep -q growpart /etc/cloud/cloud.cfg; then
+  sed -i 's/ - resizefs/ - growpart\n - resizefs/' /etc/cloud/cloud.cfg
+fi
+
+# allow sudo powers to cloud-user
+echo -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
+
+# Disable subscription-manager yum plugins
+sed -i 's|^enabled=1|enabled=0|' /etc/yum/pluginconf.d/product-id.conf
+sed -i 's|^enabled=1|enabled=0|' /etc/yum/pluginconf.d/subscription-manager.conf
+
+echo "Cleaning old yum repodata."
+dnf clean all
+
+# clean up installation logs"
+rm -rf /var/log/yum.log
+rm -rf /var/lib/yum/*
+rm -rf /root/install.log
+rm -rf /root/install.log.syslog
+rm -rf /root/anaconda-ks.cfg
+rm -rf /var/log/anaconda*
+
+echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+mkdir -p /var/cache/yum
+/usr/sbin/fixfiles -R -a restore
+
+# remove random-seed so it's not the same every time
+rm -f /var/lib/systemd/random-seed
+
+# Remove machine-id on the pre generated images
+cat /dev/null > /etc/machine-id
+
+# Anaconda is writing to /etc/resolv.conf from the generating environment.
+# The system should start out with an empty file.
+truncate -s 0 /etc/resolv.conf
+
+%end
--- a/fedora-i3-common.ks
+++ b/fedora-i3-common.ks
@@ -0,0 +1,35 @@
+# fedora-livecd-i3.ks
+#
+# Description:
+# - Fedora Live Spin with the tiling window manager i3wm
+#
+# Maintainer(s):
+# - Nasir Hussain    <nasirhm@fedoraproject.org>
+# - Eduard Lucena    <x3mboy@fedoraproject.org>
+# - Justin W. Flory  <jwf@fedoraproject.org>
+# - Dan Cermak       <defolos@fedoraproject.org>
+
+
+%packages
+@^i3-desktop-environment
+feh
+dex-autostart
+thunar
+
+
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam
+# Admin tools are handy to have
+@admin-tools
+wget
+# Better more popular browser
+system-config-printer
+
+# save some space
+-autofs
+-acpid
+-gimp-help
+-desktop-backgrounds-basic
+-aspell-*                   # dictionaries are big
+
+%end
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -8,7 +8,7 @@ timezone --utc Etc/UTC
 selinux --enforcing
 rootpw --lock --iscrypted locked

-bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
+bootloader --timeout=1 --append="modprobe.blacklist=vc4"

 network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=NetworkManager,sshd,rngd
@@ -19,7 +19,7 @@ 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/stable/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/rawhide/${basearch}/iot

 reboot

@@ -44,14 +44,14 @@ 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/stable/${arch}/iot"
+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/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot"
+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/stable/${arch}/iot" --delete
+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
@@ -70,14 +70,6 @@ cp /etc/skel/.bash* /var/roothome

 # Remove any persistent NIC rules generated by udev
 rm -vf /etc/udev/rules.d/*persistent-net*.rules
-# And ensure that we will do DHCP on eth0 on startup
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF

 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/random-seed
@@ -95,8 +87,7 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"

-# For trac ticket https://pagure.io/atomic-wg/issue/128
-rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+rm -f /etc/NetworkManager/system-connections/*.nmconnection

 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@@ -1,17 +1,21 @@

 %packages
+# install env-group to resolve RhBug:1891500
+@^kde-desktop-environment
+
@firefox
@kde-apps
-@kde-desktop
@kde-media
-@kde-office
-@networkmanager-submodules
+@libreoffice
+# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
+libreoffice-draw
+libreoffice-math
+
 fedora-release-kde

-### The KDE-Desktop
+-@admin-tools

-### Browser
-falkon
+### The KDE-Desktop

 ### fixes

@@ -30,15 +34,15 @@ kde-l10n
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
-#-ktorrent			# kget has also basic torrent features (~3 megs)
+-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
+-krusader			# ~4 megs
+-k3b				# ~15 megs
+
 #-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
--- a/fedora-live-astronomy_kde.ks
+++ b/fedora-live-astronomy_kde.ks
@@ -54,7 +54,7 @@ kstars
 # misc. astronomy
 #celestia
 stellarium
-virtualplanet
+#virtualplanet

 # Some astro environment stuff
 astronomy-menus
@@ -94,10 +94,8 @@ python3-photutils
 python3-pyvo
 python3-reproject
 python3-sep
-python3-wcsaxes

 # matplotlib backends
-python3-matplotlib-qt4
 python3-matplotlib-qt5
 python3-matplotlib-tk

@@ -110,9 +108,6 @@ boinc-client
 boinc-manager

 #Version control- a GUI for each as well
-
-# Installing rapidsvn will also install subversion package
-rapidsvn 
 git
 git-gui

@@ -125,14 +120,14 @@ kst-fits
 LabPlot

 #Misc. Utils
-# icedtea-web to have webstart useful for VO tools
-icedtea-web
 ImageMagick
 kate
 kate-plugins
 rlwrap
 screen
-plasma-applet-redshift-control
+
+# Java JRE for VO tools
+java

 # Omit KDE 4 translations for now: https://bugzilla.redhat.com/show_bug.cgi?id=1197940
 -kde-l10n-*
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -24,17 +24,6 @@ shutdown
 %include fedora-repo.ks

 %packages
-@base-x
-@guest-desktop-agents
-@standard
-@core
-@fonts
-@input-methods
-@dial-up
-@multimedia
-@hardware-support
-@printing
-
 # Explicitly specified here:
 # <notting> walters: because otherwise dependency loops cause yum issues.
 kernel
@@ -198,9 +187,6 @@ 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 || :
@@ -302,9 +288,6 @@ EOF

 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
@@ -341,23 +324,15 @@ touch /etc/machine-id


 %post --nochroot
-cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
+# 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 works on x86, x86_64
-if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-    # For livecd-creator builds
-    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
-
-    # For lorax/livemedia-creator builds
-    sed -i '
-    /## make boot.iso/ i\
-    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-    <% f = "usr/bin/livecd-iso-to-disk" %>\
-    %if exists(f):\
-        install ${f} ${LIVEDIR}/${f|basename}\
-    %endif\
-    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
+    # 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
--- a/fedora-live-comp_neuro.ks
+++ b/fedora-live-comp_neuro.ks
@@ -2,7 +2,7 @@
 # https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
 #
 # Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org

 %include fedora-live-workstation.ks
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -1,59 +1,17 @@
 # fedora-design-suite.ks
 # Based on Live Workstation
-# Description:
-# - A collection of applications targeted towards professional visual designers
-# Website: http://fedoraproject.org/wiki/Design_Suite
-# Maintainer:
-# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
-# - Credit to Sebastian Dziallas for initiating the project
+# A collection of applications for professional visual designers
+# http://fedoraproject.org/wiki/Design_Suite
+# Maintained by Luya Tshimbalanga <luya AT fedoraproject DOT org>
+# Credit to Sebastian Dziallas for initiating the project

 %include fedora-live-workstation.ks
+%include fedora-design-suite-common.ks

 # Size partition
 part / --size 14336

-%packages
-# Switch to groups for design suite
-@design-suite
-
-# Provides backup application
-#deja-dup
-#deja-dup-nautilus
-
-# Add extra gnome applications
-gnome-books
-gnome-calendar
-gnome-photos
-gnome-shell-extension-pomodoro
-gnome-todo
-
-# Add cosmetic for gnome-terminal
-powerline
-powerline-fonts
-
-# Extra wallpapers
-f33-backgrounds-extras-gnome
-
-# removal of unneeded applications
-gnome-boxes
-eog
-rdesktop
-
-# temporarily removing conflicting applications
-blender-luxcorerender
-mypaint
-shutter
-sparkleshare
-
-%end
-
 %post
-#Override the favorite desktop application in Dash
-cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
-[org.gnome.shell]
-favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
-FOE
-
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -93,7 +51,21 @@ Categories=Documentation;
 FOE
 chmod a+x /usr/share/applications/fedora-design-team.desktop

+# Use Powerline in bash
+cat >>  $HOME/.bashrc << FOE
+# Enable powerline daemon
+if [ -f `which powerline-daemon` ]; then
+  powerline-daemon -q
+  POWERLINE_BASH_CONTINUATION=1
+  POWERLINE_BASH_SELECT=1
+  . /usr/share/powerline/bash/powerline.sh
+fi
+FOE
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

+#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
+
 %end
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@@ -150,7 +150,7 @@ gweled

 # puzzles (big)
 enigma
-fillets-ng
+# fillets-ng # broken in f34
 pingus

 # puzzles (small)
--- a/fedora-live-i3.ks
+++ b/fedora-live-i3.ks
@@ -0,0 +1,59 @@
+# fedora-livecd-i3.ks
+#
+# Description:
+# - Fedora Live Spin with the tiling window manager i3
+#
+# Maintainer(s):
+# - Nasir Hussain    <nasirhm@fedoraproject.org>
+# - Eduard Lucena    <x3mboy@fedoraproject.org>
+# - Dan Cermak       <defolos@tummy.com>
+# - Justin W. Flory  <jwf@fedoraproject.org>
+
+%include fedora-live-base.ks
+%include fedora-live-minimization.ks
+%include fedora-i3-common.ks
+
+%post
+# xfce configuration
+
+# create /etc/sysconfig/desktop (needed for installation)
+
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/i3
+DISPLAYMANAGER=/usr/sbin/lightdm
+EOF
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# 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 i3 as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=i3/' /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
+
+# this goes at the end after all other changes.
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+# setting the wallpaper
+echo "/usr/bin/feh --bg-scale /usr/share/backgrounds/default.png" >> /home/liveuser/.profile
+
+# echoing type liveinst to start the installer
+echo "echo 'Please type liveinst and press Enter to start the installer'" >> /home/liveuser/.bashrc
+
+# fixing the installer non opening bug
+echo "xhost si:localuser:root" >> /home/liveuser/.profile
+
+EOF
+
+%end
+
--- a/fedora-live-jam_kde.ks
+++ b/fedora-live-jam_kde.ks
@@ -7,7 +7,7 @@
 # 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

--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -22,15 +22,22 @@ EOF
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << EOF

+# are we *not* able to use wayland sessions?
+if strstr "\`cat /proc/cmdline\`" nomodeset ; then
+PLASMA_SESSION_FILE="plasmax11.desktop"
+else
+PLASMA_SESSION_FILE="plasma.desktop"
+fi
+
 # 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
+sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
-Session=plasma.desktop
+Session=\${PLASMA_SESSION_FILE}
 SDDM_EOF
 fi

@@ -55,9 +62,10 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
 Driver=QSQLITE3
 AKONADI_EOF

-# Disable plasma-pk-updates (bz #1436873 and 1206760)
-echo "Removing plasma-pk-updates package."
-rpm -e plasma-pk-updates
+# "Disable plasma-discover-notifier"
+mkdir -p /home/liveuser/.config/autostart
+cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/
+echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop

 # Disable baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -12,7 +12,7 @@
 %include fedora-kde-minimization.ks

 # DVD payload
-part / --size=7000
+part / --size=7200

 %post
 %end
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@@ -10,7 +10,8 @@ part / --size 10752

 %packages
 # Start with GNOME
-@gnome-desktop
+# Install workstation-product-environment to resolve RhBug:1891500
+@^workstation-product-environment

 # Add robotics development packages
@robotics-suite
@@ -30,9 +31,10 @@ mercurial
 -@dial-up
 -@input-methods
 -@standard
-
-# Add a web browser
-@firefox
+-@container-management
+-@libreoffice
+-@networkmanager-submodules
+-@workstation-product

 # Remove office suite
 -libreoffice-*
@@ -57,7 +59,6 @@ mercurial

 # Help and art can be big, too
 -gnome-user-docs
-gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras
--- a/fedora-live-scientific_kde.ks
+++ b/fedora-live-scientific_kde.ks
@@ -13,7 +13,7 @@
 %include fedora-scientific-common.ks

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

 %post

--- a/fedora-live-security.ks
+++ b/fedora-live-security.ks
@@ -21,7 +21,9 @@
 part / --size 10240

 %packages
-@xfce-desktop
+# install env-group to resolve RhBug:1891500
+@^xfce-desktop-environment
+
@xfce-apps

 # Security tools
--- a/fedora-live-soas.ks
+++ b/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 <ibiamchihurumnaya AT gmail DOT com>
+# - Alex Perez <aperez AT alexperez DOT com>

 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -66,6 +66,11 @@ FOE
    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
  fi

+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
  # Copy Anaconda branding in place
  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
    cp -a /usr/share/lorax/product/* /
--- a/fedora-lxde-common.ks
+++ b/fedora-lxde-common.ks
@@ -8,11 +8,12 @@

 %packages
 ### LXDE desktop
-@lxde-desktop
+# install env-group to resolve RhBug:1891500
+@^lxde-desktop-environment
+
@lxde-apps
@lxde-media
@lxde-office
-@networkmanager-submodules

 # FIXME: can be omitted once comps is updated
 midori
@@ -39,6 +40,7 @@ metacity
 #-words

 # save some space
+-@admin-tools
 -autofs
 -acpid
 -gimp-help
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -9,10 +9,11 @@
 #

 %packages
-@lxqt
+# install env-group to resolve RhBug:1891500
+@^lxqt-desktop-environment
+
@lxqt-apps
@lxqt-media
-@networkmanager-submodules

 # for nm applet
 gnome-keyring
@@ -43,6 +44,7 @@ wqy-microhei-fonts          # a compact CJK font, to replace:

 # remove input methods to free space
 -@input-methods
+-@admin-tools
 -scim*
 -m17n*
 # Temporary include ibus to workaround RHBZ 1633225
--- a/fedora-mate-common.ks
+++ b/fedora-mate-common.ks
@@ -1,6 +1,8 @@
 %packages
+# install env-group to resolve RhBug:1891500
+@^mate-desktop-environment
+
 fedora-release-matecompiz
-@mate
 compiz
 compiz-plugins-main
 compiz-plugins-extra
@@ -14,7 +16,6 @@ simple-ccsm
 emerald-themes
 emerald
 fusion-icon
-@networkmanager-submodules

 # blacklist applications which breaks mate-desktop
 -audacious
@@ -31,6 +32,7 @@ nss-mdns

 # Drop things for size
 -@3d-printing
+-@admin-tools
 -brasero
 -fedora-icon-theme
 -gnome-icon-theme
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@@ -1,8 +1,10 @@
 %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
--- a/fedora-neuro-gnome-common.ks
+++ b/fedora-neuro-gnome-common.ks
@@ -1,7 +1,7 @@
 # Description: Common gnome based configuration for NeuroFedora spin images.
 #
 # Maintained by the NeuroFedora SIG:
-# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# https://neuro.fedoraproject.org
 # mailto:neuro-sig@lists.fedoraproject.org

 # Please specify the individual package sets in their own ks files:
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@@ -27,9 +27,18 @@ wget
 -python3.6
 -python3.7
 -python3.8
+-python3.9
 -pypy

 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
+#               and https://bugzilla.redhat.com/show_bug.cgi?id=1902354
+-texlive-base
 -texlive-latex

+# Remove gdal recommended by networkx, brings in close to 600M of proj data
+# Also explicitly list proj to make sure both packages are gone
+# https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/thread/LGC5IMMHZ4DM7GQNPAFC6GU362PPTN7O/
+-python3-gdal
+-proj
+
 %end
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -58,7 +58,6 @@ python3-pillow-tk

 # Help and art can be big, too
 -gnome-user-docs
-gnome-getting-started-docs
 -desktop-backgrounds-basic
 -*backgrounds-extras

@@ -91,6 +90,9 @@ python3-pillow-tk
 -system-config-services
 -policycoreutils-gui

+# Inkscape is too big to be included
+-inkscape
+
 %end


--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented

 # For the master branch the following should be uncommented
-# %include fedora-repo-rawhide.ks
+%include fedora-repo-rawhide.ks

 # For non-master branches the following should be uncommented
-%include fedora-repo-not-rawhide.ks
+# %include fedora-repo-not-rawhide.ks
--- a/fedora-scientific-common.ks
+++ b/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,12 +61,6 @@ julia
 julia-doc
 julia-devel

-# IDEs for the IDE folks
-@eclipse
-
-# Workaround for https://pagure.io/releng/issue/7814
-eclipse-linuxtools-vagrant
-
 python3-spyder
 python3-spyder-kernels

@@ -138,7 +132,6 @@ screen
 tmux
 rlwrap
 hexchat
-shutter
 fig2ps
 bibtex2html
 hevea
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -4,15 +4,17 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
+# - Alex Perez <aperez AT alexperez DOT com>

 firewall --enabled --service=mdns,presence

 %packages
+# install env-group to resolve RhBug:1891500
+@^sugar-desktop-environment

 # == Core Sugar Platform ==
 fedora-release-soas
-@sugar-desktop

 # explicitly remove a bunch of extra stuff
 -openbox
@@ -39,7 +41,6 @@ fedora-release-soas
 -hyperv-daemons
 -sane-backends
 -sane-backends-drivers-scanners
-chkconfig
 -dhcp-client
 -gcc-gdb-plugin
 -gcc
@@ -52,12 +53,6 @@ aajohan-comfortaa-fonts
 sil-abyssinica-fonts
 vlgothic-fonts

-# Write breaks unless we do this (we don't need it anyway)
-@input-methods
-
-# Needed for wifi, bluetooth and WWAN connection support
-@networkmanager-submodules
-
 # Usefulness for DSL connections as per:
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
@@ -110,6 +105,7 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
+
 /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas

 %end
--- a/fedora-workstation-common.ks
+++ b/fedora-workstation-common.ks
@@ -5,21 +5,8 @@
 -@input-methods
 -@standard

-# Make sure to sync any additions / removals done here with
-# workstation-product-environment in comps
-@base-x
-@container-management
-@core
-@firefox
-@fonts
-@gnome-desktop
-@guest-desktop-agents
-@hardware-support
-@libreoffice
-@multimedia
-@networkmanager-submodules
-@printing
-@workstation-product
+# Install workstation-product-environment to resolve RhBug:1891500
+@^workstation-product-environment

 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
--- a/fedora-xfce-common.ks
+++ b/fedora-xfce-common.ks
@@ -4,27 +4,21 @@
 # - Fedora Live Spin with the light-weight XFCE Desktop Environment
 #
 # Maintainer(s):
-# - Rahul Sundaram    <sundaram@fedoraproject.org>
-# - Christoph Wickert <cwickert@fedoraproject.org>
 # - Kevin Fenzi       <kevin@tummy.com>
 # - Adam Miller       <maxamillion@fedoraproject.org>
-
+# - Mukundan Ragavan  <nonamedotc@fedoraproject.org>

 %packages

 fedora-release-xfce
-@networkmanager-submodules
-@xfce-desktop
+# install env-group to resolve RhBug:1891500
+@^xfce-desktop-environment
+
@xfce-apps
@xfce-extra-plugins
@xfce-media
@xfce-office

-# Admin tools are handy to have
-@admin-tools
-# Add some screensavers, people seem to like them
-# Note that blank is still default.
-xscreensaver-extras
 wget
 system-config-printer

@@ -35,5 +29,6 @@ system-config-printer
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
+-xfce4-eyes-plugin

 %end
--- a/maintainers.toml
+++ b/maintainers.toml
@@ -21,19 +21,18 @@ fas = [ "grinnz" ]
 maintainers = [ "Dan Book" ]

 [spins.lxde.x86_64]
-fas = [ "cwickert" ]
-maintainers = [ "Christoph Wickert" ]
+fas = [ "cwickert", "mtasaka" ]
+maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
 [spins.lxde.armhfp]
-fas = [ "cwickert" ]
-maintainers = [ "Christoph Wickert" ]
+fas = [ "cwickert", "mtasaka" ]
+maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]

 [spins.soas.x86_64]
-fas = [ "chimosky", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Peter Robinson" ]
+fas = [ "chimosky", "aperezbios" ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
 [spins.soas.armhfp]
-fas = [ "chimosky", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Peter Robinson" ]
-
+fas = [ "chimosky", "aperezbios", ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", ]

 [labs.astronomy_kde.x86_64]
 fas = [ "lupinix" ]
@@ -56,8 +55,8 @@ fas = [ "dagostinelli" ]
 maintainers = [ "Darryl T. Agostinelli" ]

 [labs.jam_kde.x86_64]
-fas = [ "eeickmeyer" ]
-maintainers = [ "Erich Eickmeyer" ]
+fas = [ "q5sys" ]
+maintainers = [ "JT Pennington" ]

 [labs.python_classroom.x86_64]
 fas = [ "churchyard", "python-sig" ]
@@ -70,3 +69,11 @@ maintainers = [ "SciTech SIG" ]
 [labs.scientific.x86_64]
 fas = [ "scitech" ]
 maintainers = [ "SciTech SIG" ]
+
+[labs.robotics.x86_64]
+fas = [ "rmattes", "robotics-sig" ]
+maintainers = [ "Rich Mattes", "Robotics SIG" ]
+
+[spins.i3.x86_64]
+fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ]
+maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ]