Add sudo to the fedora container base image.

sudo is needed in the base image for it to be used in Azure services

Signed-off-by: Clement Verna <cverna@tutanota.com>

fedora-arm-base.ks

@@ -1,5 +1,6 @@
-#keyboard us
 lang en_US.UTF-8
+#keyboard us
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
@@ -7,6 +8,7 @@ bootloader --location=mbr
 
 part /boot/efi --size=80 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
+part / --size=2800 --fstype ext4 --asprimary
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
@@ -42,6 +44,7 @@ initial-setup-gui
 
 # make sure all the locales are available for inital0-setup and anaconda to work
 glibc-all-langpacks
+
 %end
 
 %post
@@ -49,11 +52,10 @@ glibc-all-langpacks
 # 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}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this ARM disk image"
@@ -71,8 +73,13 @@ systemctl mask tmp.mount
 
 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
 
 %end
+

fedora-arm-lxqt.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 
-part / --size=4400 --fstype ext4 --asprimary
+part / --size=4200 --fstype ext4 --asprimary
 
 %packages
 # trojita not available on non-x86 platforms

fedora-arm-mate.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks
 
-part / --size=7168 --fstype ext4
+part / --size=6000 --fstype ext4
 
 %post
 

fedora-arm-minimal.ks

@@ -1,7 +1,8 @@
 %include fedora-arm-base.ks
 %include fedora-minimal-common.ks
 
-part / --size=1400 --fstype ext4
+part /boot --size=512 --fstype ext4
+part / --size=1256 --fstype ext4
 
 %packages
 -xkeyboard-config

fedora-arm-workstation.ks

@@ -7,8 +7,6 @@ part / --size=6200 --fstype ext4
 %packages
 -initial-setup
 -initial-setup-gui
--libvirt*
--gnome-boxes
 
 %end
 

fedora-arm-xbase.ks

@@ -4,7 +4,6 @@
 @input-methods
 @multimedia
 @printing
-epiphany
 %end
 
 %post

fedora-arm-xfce.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks
 
-part / --size=5000 --fstype ext4
+part / --size=4700 --fstype ext4
 
 %post
 

fedora-atomic-testing-base.ks

@@ -0,0 +1,27 @@
+
+# ./fedora-atomic-testing-base.ks - for building media from the testing
+# refs (fedora/29/${basearch}/testing/atomic-host)
+
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/testing/atomic-host
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+# Set the origin to the "main stable ref", distinct from /testing/ which is where bodhi writes.
+# We want consumers of this image to track the two week releases.
+ostree admin set-origin --index 0 fedora-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-atomic:fedora/29/${arch}/testing/atomic-host" --create "fedora-atomic:fedora/29/${arch}/atomic-host"
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs "fedora-atomic:fedora/29/${arch}/testing/atomic-host" --delete
+
+# delete/add the remote with new options to enable gpg verification
+# and to point them at the cdn url
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
+
+%end

fedora-atomic-testing.ks

@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-testing.ks - for building base cloud media 
+# from the testing refs (fedora/29/${basearch}/testing/atomic-host)
+
+%include fedora-atomic.ks
+%include fedora-atomic-testing-base.ks

fedora-atomic-updates-base.ks

@@ -0,0 +1,27 @@
+
+# ./fedora-atomic-updates-base.ks - for building media from the updates
+# refs (fedora/29/${basearch}/updates/atomic-host)
+
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/updates/atomic-host
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+# Set the origin to the "main stable 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-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-atomic:fedora/29/${arch}/updates/atomic-host" --create "fedora-atomic:fedora/29/${arch}/atomic-host"
+
+# Remove the old ref so that the commit eventually gets
+# cleaned up.
+ostree refs "fedora-atomic:fedora/29/${arch}/updates/atomic-host" --delete
+
+# delete/add the remote with new options to enable gpg verification
+# and to point them at the cdn url
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
+
+%end

fedora-atomic-updates.ks

@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-updates.ks - for building base cloud media 
+# from the updates refs (fedora/29/${basearch}/updates/atomic-host)
+
+%include fedora-atomic.ks
+%include fedora-atomic-updates-base.ks

fedora-atomic-vagrant-testing.ks

@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-vagrant-testing.ks - for building media from the testing
+# refs (fedora/29/${basearch}/testing/atomic-host) for vagrant
+
+%include fedora-atomic-vagrant.ks
+%include fedora-atomic-testing-base.ks

fedora-atomic-vagrant-updates.ks

@@ -0,0 +1,6 @@
+
+# ./fedora-atomic-vagrant-updates.ks - for building media from the updates
+# refs (fedora/29/${basearch}/updates/atomic-host) for vagrant
+
+%include fedora-atomic-vagrant.ks
+%include fedora-atomic-updates-base.ks

fedora-atomic-vagrant.ks

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

fedora-atomic.ks

@@ -0,0 +1,157 @@
+# Fedora Atomic Host is the Fedora version of the "Atomic Host" pattern
+# from [Project Atomic](http://www.projectatomic.io/).
+
+# This kickstart is used for cloud/virt images, and uses cloud-init
+# to bootstrap authentication, just like Fedora Cloud Base.  (Also note the
+# fedora-atomic-vagrant.ks kickstart inherits from this).
+
+# One very important thing to understand is that this image contains the same
+# OSTree commit as will be used on bare metal installations - Fedora Atomic Host
+# also has an ISO. One difference though is that cloud-init isn't enabled for
+# bare metal. When processing this kickstart then, Anaconda isn't actually
+# installing packages - it's just replicating a "pre-assembled" tree from
+# rpm-ostree.
+
+# Basically, the `ostreesetup` verb replaces the traditional `%packages`
+# section. For example, `rpm-ostree status` can show you the same checksum and
+# version from an ISO install and this cloud image - it's the same bits.
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --passalgo=sha512
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+# Explicitly disable firewall since cloud providers generally provide
+# higher level firewall constructs (i.e. security groups).
+firewall --disabled
+
+# console=ttyAMA0 and console=hvc0 as kernel boot parameter to see
+# kernel boot messages on serial console as well on aarch64 and
+# ppc64le respectively.
+# https://pagure.io/atomic-wg/issue/347
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 console=ttyAMA0 console=hvc0 net.ifnames=0"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
+
+zerombr
+clearpart --all
+# Implement: https://pagure.io/atomic-wg/issue/281
+# The bare metal layout currently inherits from fedora server and is in
+# https://github.com/rhinstaller/anaconda/blob/master/pyanaconda/installclasses/fedora_atomic_host.py
+# However, the disk size is currently just 6GB for the cloud image (defined in pungi-fedora).  So the
+# "15GB, rest unallocated" model doesn't make sense.  The Vagrant box is 40GB (apparently a number of
+# Vagrant boxes come big and rely on thin provisioning).
+# In both cases, it's simplest to just fill all the disk space.
+#
+# Use reqpart to create hardware platform specific partitions
+# https://pagure.io/atomic-wg/issue/299
+reqpart --add-boot
+part pv.01 --grow
+volgroup atomicos pv.01
+# Start from 3GB as we did before, since we just need a size.  But we do --grow to fill all space.
+logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
+
+# Equivalent of %include fedora-repo.ks
+# Pull from the ostree repo that was created during the compose
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/atomic-host
+
+reboot
+
+%post --erroronfail
+# See https://github.com/projectatomic/rpm-ostree/issues/42
+# Set the ostree repo to the location we want users to upgrade from
+# This location is where the compose gets synced to after the compose
+# is done.
+ostree remote delete fedora-atomic
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
+
+# 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
+
+# Configure docker-storage-setup to resize the partition table on boot
+# and extend the root filesystem to fill it.
+# https://pagure.io/atomic-wg/issue/343
+echo 'GROWPART=true' >> /etc/sysconfig/docker-storage-setup
+echo 'ROOT_SIZE=+100%FREE' >> /etc/sysconfig/docker-storage-setup
+
+echo -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
+
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# 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
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+# Uncomment this if you want to use cloud init but suppress the creation
+# of an "ec2-user" account. This will, in the absence of further config,
+# cause the ssh key from a metadata source to be put in the root account.
+#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
+#users: []
+#disable_root: 0
+#EOF
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/systemd/random-seed
+
+echo "Packages within this cloud image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+# For trac ticket https://pagure.io/atomic-wg/issue/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
+# Disable network service here, as doing it in the services line
+# fails due to RHBZ #1369794
+/sbin/chkconfig network off
+
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
+%end

fedora-cinnamon-common.ks

@@ -14,6 +14,6 @@
 parole
 
 # extra backgrounds
-f32-backgrounds-extras-gnome
+f29-backgrounds-extras-gnome
 
 %end

fedora-cloud-base.ks

@@ -29,6 +29,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 
@@ -136,7 +137,7 @@ echo "Removing firewalld."
 # not work when package was installed by Anaconda instead of command line.
 # Also -- check if this is still even needed with new anaconda -- disabled
 # firewall should _not_ pull in this package.
-# dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
 dnf -C -y erase "firewalld*"
 
 # Another one needed at install time but not after that, and it pulls
@@ -214,7 +215,7 @@ truncate -c -s 0 /var/log/dnf.log
 truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 

fedora-cloud-bigdata.ks

@@ -16,6 +16,7 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 user --name=none
@@ -111,12 +112,12 @@ rpm -e linux-firmware
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.
 echo "Removing firewalld."
-dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -175,13 +176,13 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/random-seed
 
-echo "Cleaning old dnf repodata."
+echo "Cleaning old yum repodata."
-dnf history new
+yum history new
-dnf clean all
+yum clean all
-truncate -c -s 0 /var/log/dnf.log
+truncate -c -s 0 /var/log/yum.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
@@ -203,7 +204,7 @@ dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-mkdir -p /var/cache/dnf
+mkdir -p /var/cache/yum
 /usr/sbin/fixfiles -R -a restore
 
 echo "Zeroing out empty space."

fedora-cloud-experimental.ks

@@ -103,12 +103,12 @@ rpm -e linux-firmware
 # Remove firewalld; was supposed to be optional in F18+, but is required to
 # be present for install/image building.
 echo "Removing firewalld."
-dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
+yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -167,13 +167,13 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/random-seed
 
-echo "Cleaning old dnf repodata."
+echo "Cleaning old yum repodata."
-dnf history new
+yum history new
-dnf clean all
+yum clean all
-truncate -c -s 0 /var/log/dnf.log
+truncate -c -s 0 /var/log/yum.log
 
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
@@ -196,7 +196,7 @@ dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-mkdir -p /var/cache/dnf
+mkdir -p /var/cache/yum
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys

fedora-comp-neuro-common.ks

@@ -1,47 +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
-
-# Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
-@python-science
-
-# Add julia and R
-R
-julia
-
-#Computational neuroscience packages
-auryn-mpich
-auryn-openmpi
-bionetgen
-calcium-calculator
-COPASI
-qalculate
-getdp
-genesis-simulator
-gnuplot
-moose
-nest
-neuron
-neurord
-octave
-paraview
-python3
-python3-brian2
-python-brian2-doc
-python3-ipython
-python3-nest
-python3-neuron
-python3-libNeuroML
-python3-neo
-# Currently broken in rawhide
-# python3-nineml
-# python-nineml-doc
-python3-PyLEMS
-python-PyLEMS-doc
-smoldyn
-
-%end

fedora-disk-base.ks

@@ -11,6 +11,7 @@ text
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 services --enabled=sshd,NetworkManager,chronyd,zram-swap
@@ -60,9 +61,8 @@ glibc-all-langpacks
 
 # Setup Raspberry Pi firmware
 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
 
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa

fedora-disk-server.ks

@@ -8,15 +8,12 @@ autopart --noswap
 # install the default groups for the server environment since installing the environment is not working
 @server-product
 @standard
-@core
 @headless-management
 @hardware-support
 @networkmanager-submodules
 
 @container-management
 @domain-client
-@guest-agents
-@server-hardware-support
 -initial-setup-gui
 -generic-release*
 %end

fedora-disk-xfce.ks

@@ -1,17 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-xfce-common.ks
-
-bootloader --append="cma=192MB"
-
-services --enabled=sshd,NetworkManager,chronyd,zram-swap
-
-autopart --type=plain --noswap
-
-%packages
-
-%end
-
-%post
-
-%end

fedora-docker-base-minimal.ks

@@ -1,8 +1,8 @@
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
 # This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.
 
-%include fedora-container-common.ks
+%include fedora-docker-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 microdnf

fedora-docker-base.ks

@@ -1,9 +1,9 @@
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
+# See docker-base-common.ks for details on how to hack on docker image kickstarts
 # This base is a standard Fedora image with python3 and dnf
 
-%include fedora-container-common.ks
+%include fedora-docker-common.ks
 
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+%packages --excludedocs --instLangs=en --nocore
 rootfiles
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
@@ -13,9 +13,6 @@ dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sssd-client
 sudo
--glibc-langpack-en
--cracklib-dicts
--langpacks-en
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
@@ -47,19 +44,4 @@ umount /run
 systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
 rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
-# Final pruning
-rm -rfv /var/cache/* /var/log/* /tmp/*
-
-%end
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
-# NOTE: run this in nochroot because "find" does not exist in chroot
-KEEPLANG=en_US
-for dir in locale i18n; do
-    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
-done
-
 %end

fedora-docker-common.ks

@@ -1,4 +1,4 @@
-# This is the common bits between Fedora Container base image.
+# This is the common bits between Fedora Docker base image.
 #
 # To keep this image minimal it only installs English language. You need to change
 # dnf configuration in order to enable other languages.
@@ -12,8 +12,8 @@
 #
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
 #
-#   ksflatten -c fedora-container-base[-minimal].ks -o fedora-container-base-test.ks
+#   ksflatten -c fedora-docker-base[-minimal].ks -o fedora-docker-base-test.ks
-#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-base-test.ks docker
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-docker-base-test.ks docker
 #
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
@@ -29,17 +29,16 @@ zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
-%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+%packages --excludedocs --instLangs=en --nocore
 fedora-release-container
 bash
 coreutils
 glibc-minimal-langpack
+libcrypt
 rpm
 shadow-utils
 sssd-client
 util-linux
-# needed by Anaconda https://bugzilla.redhat.com/show_bug.cgi?id=1744115
-systemd
 -kernel
 -dosfstools
 -e2fsprogs
@@ -62,12 +61,9 @@ set -eux
 LANG="en_US"
 echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
-echo 'LANG="C.UTF-8"' >  /etc/locale.conf
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-release-container)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-iot.ks

@@ -5,13 +5,18 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 
+# Add most common consoles console=ttyAMA0 console=ttyS0 console=ttyS1 as kernel boot parameter
 bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=NetworkManager,sshd,rngd,zram-swap
+services --enabled=NetworkManager,sshd,rngd,initial-setup,zram-swap
+
+# tell Initial Setup to run in the reconfig mode
+firstboot --reconfig --enable
 
 zerombr
 clearpart --all --initlabel --disklabel=msdos
@@ -31,11 +36,9 @@ arch=$(uname -m)
 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_2/u-boot.bin /boot/fw/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_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
 fi
 fi
 
@@ -53,9 +56,9 @@ ostree refs "fedora-iot:fedora/stable/${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'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019 --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
+# We're gettin 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
@@ -65,6 +68,13 @@ passwd -l root
 # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
 cp /etc/skel/.bash* /var/roothome
 
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
 # 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
@@ -95,6 +105,9 @@ 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
 
+echo "Adding Developer Mode GRUB2 menu item."
+/usr/libexec/atomic-devmode/bootentry add
+
 # 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:

fedora-kde-common.ks

@@ -6,7 +6,6 @@
 @kde-media
 @kde-office
 @networkmanager-submodules
-fedora-release-kde
 
 ### The KDE-Desktop
 

fedora-live-base.ks

@@ -10,6 +10,7 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
@@ -44,13 +45,11 @@ 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+
+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
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
@@ -58,14 +57,10 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-# syslinux is in @x86-baremetal-tools
+syslinux
 
 # 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
 %end
 
 %post
@@ -107,7 +102,13 @@ for arg in \`cat /proc/cmdline\` ; do
   fi
 done
 
-# enable swapfile if it exists
+# enable swaps unless requested otherwise
+swaps=\`blkid -t TYPE=swap -o device\`
+if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
+  for s in \$swaps ; do
+    action "Enabling swap partition \$s" swapon \$s
+  done
+fi
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
   action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
 fi
@@ -218,7 +219,7 @@ touch /.liveimg-configured
 # 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"
+echo "localhost-live" > /etc/hostname
 
 EOF
 
@@ -298,7 +299,7 @@ EOF
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"

fedora-live-cinnamon.ks

@@ -9,7 +9,7 @@
 %include fedora-live-base.ks
 %include fedora-cinnamon-common.ks
 
-part / --size=8192
+part / --size=6144
 
 %post
 # cinnamon configuration

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 9656

fedora-live-design_suite.ks

@@ -32,7 +32,8 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-f32-backgrounds-extras-gnome
+f28-backgrounds-extras-base
+f28-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
@@ -40,9 +41,8 @@ f32-backgrounds-extras-gnome
 -rdesktop
 
 # temporarily removing conflicting application
+-LuxRender-blender
 -mypaint
--sparkleshare
--blender-luxcorerender
 
 %end
 

fedora-live-games.ks

@@ -1,16 +1,8 @@
-# fedora-live-games.ks
+# fedora-livedvd-games.ks
 #
-# Maintainer:
+# Maintainer(s):
-# - Darryl T. Agostinelli <dagostinelli@gmail.com>
-#   https://fedoraproject.org/wiki/User:Dagostinelli
-#
-# Former Maintainers:
 # - Bruno Wolff III <bruno@wolff.to>
-#   https://fedoraproject.org/wiki/User:Bruno
+# - Formerly maintained by Rahul Sundaram
-#
-# - Rahul Sundaram <sundaram@fedoraproject.org>
-#   https://fedoraproject.org/wiki/User:Sundaram
-#
 
 %include fedora-live-xfce.ks
 
@@ -45,6 +37,7 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
+btanks
 bzflag
 crossfire-client
 extremetuxracer
@@ -55,20 +48,20 @@ freedoom
 freedroidrpg
 frozen-bubble
 gl-117
-# glob2 - currently broken
+glob2
 lincity-ng
-#tmw - currently broken
+tmw
 #maniadrive - currently broken
 #maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
-supertuxkart
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
@@ -96,6 +89,7 @@ kcheckers
 knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
+londonlaw
 lordsawar
 # lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
@@ -105,8 +99,9 @@ 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
+seahorse-adventures
 solarwolf
 sopwith
 stormbaancoureur
@@ -118,6 +113,7 @@ xblast
 auriferous
 alienblaster
 # duel3 # Would pull in fluid-soundfont-lite-patches
+lmarbles
 powermanga
 # raidem # Would pull in fluid-soundfont-lite-patches
 # raidem-music # Would pull in fluid-soundfont-lite-patches
@@ -134,6 +130,7 @@ KoboDeluxe
 Maelstrom
 methane
 njam
+seahorse-adventures
 shippy
 tecnoballz
 wordwarvi
@@ -155,7 +152,9 @@ pingus
 
 # puzzles (small)
 
+escape
 # gbrainy Removed for space - only game that pulls in mono
+magicor
 mirrormagic
 pipenightdreams
 pipepanic
@@ -172,6 +171,8 @@ PySolFC
 
 bygfoot
 celestia
+childsplay
+gcompris
 planets
 tuxpaint
 tuxpaint-stamps
@@ -180,13 +181,15 @@ tuxtype2
 # kde based games
 taxipilot
 
-# compilations (we are avoiding compilations, rare exceptions)
-bsd-games
-
 # utilities
 
 games-menus
 
+# Note some stuff I don't want pulled into the games spin.
+
+# No compilations of games as I want to only include games that at least
+# someone thought were good within a genre.
+
 # Nothing should be downloading data to play.
 -autodownloader
 

fedora-live-jam_kde.ks

@@ -7,7 +7,9 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 
-# Maintainer: Erich Eickmeyer <erich@ericheickmeyer.com>
+# Maintainer: Jørn Lomax <northlomax@gmail.com>
+#             https://fedoraproject.org/wiki/User:jvlomax
+#             Brendan Jones <brendan.jones.it@gmail.com>
 
 %include fedora-live-kde.ks
 
@@ -18,10 +20,123 @@ part / --size 10240 --fstype ext4
 bootloader --append="threadirqs"
 
 %packages
-@audio
 
-#pipewire
+#alsa
-pipewire
+alsa-firmware
+alsa-tools
+alsa-utils
+alsamixergui
+alsa-plugins-jack
+alsa-plugins-pulseaudio
+alsa-plugins-usbstream
+alsa-plugins-samplerate
+alsa-plugins-upmix
+alsa-plugins-vdownmix
+a2jmidid
+aj-snapshot
+
+#jack 
+jack-audio-connection-kit
+jack-audio-connection-kit-dbus
+qjackctl
+jackctlmmc
+ffado
+
+#pulse
+pulseaudio-module-jack
+pavucontrol
+
+#midi
+qsynth
+fluidsynth
+fluid-soundfont-gm
+fluidsynth-dssi
+timidity++
+qmidiarp
+vmpk
+harmonyseq
+
+#synthesis
+hydrogen
+bristol
+monobristol
+zynaddsubfx
+yoshimi
+swami
+Add64
+synthv1
+samplv1
+drumkv1
+ams
+
+#guitar
+rakarrack
+guitarix
+tuxguitar
+sooperlooper
+
+#recodring and DAW
+audacity
+ardour5
+rosegarden4
+seq24
+muse
+qtractor
+non-session-manager
+non-daw
+non-sequencer
+non-mixer
+
+# audio-plugins
+calf
+dssi
+jack-rack
+ladspa
+
+#ladpsa plugins
+ladspa-amb-plugins
+ladspa-autotalent-plugins
+ladspa-blop-plugins
+ladspa-cmt-plugins
+ladspa-fil-plugins
+ladspa-mcp-plugins
+ladspa-rev-plugins
+ladspa-swh-plugins
+ladspa-tap-plugins
+ladspa-vco-plugins
+
+#lv2 plugins
+lv2
+lv2-avw-plugins
+lv2-invada-plugins
+lv2-kn0ck0ut
+lv2-ll-plugins
+lv2-swh-plugins
+lv2-vocoder-plugins
+lv2-zynadd-plugins
+lv2dynparam
+lv2-abGate
+lv2-c++-tools 
+lv2-samplv1
+lv2-synthv1
+lv2-drumkv1
+lv2-triceratops
+lv2-newtonator
+lv2-x42-plugins
+lv2-fomp-plugins
+lv2-sorcer
+lv2-fabla
+lv2-artyfx-plugins
+
+#dssi
+nekobee-dssi
+whysynth-dssi
+xsynth-dssi
+hexter-dssi
+
+zynjacku 
+zita-at1
+zita-rev1
 
 #sound analasys, none of these are packaged yet
 #praat bug_id=666656
@@ -32,14 +147,35 @@ emacs
 emacs-color-theme
 vim
 nano
+mscore
+lilypond
+frescobaldi
+mup
 
 #audio utilities
+jamin
+lash
+jack_capture
+jaaa
+jmeters
+qastools
+arpage
+realTimeConfigQuickScan
+rtirq
+#patchage
+#ladish #not packaged yet
+japa
+radium-compressor
 
 # fedora jam theming (to be customized)
+kfaenza-icon-theme
 fedora-jam-backgrounds
+fedora-jam-kde-theme
 
 #Misc. Utils
 screen
+shutter
+-ksnapshot
 multimedia-menus
 kernel-tools
 
@@ -48,15 +184,12 @@ kernel-tools
 firefox
 thunderbird
 
-#remove packages not needed
+#remove packages not need
--akregator
+#-kdesdk-umbrello
--kaddressbook
+#-kdesdk-kcachegrindy
--kmail
+
--kontact
+#-kdesdk-kompare
--korganizer
+#-kdepim
--non-mixer
--non-session-manager
--non-sequencer
 
 %end
 
@@ -65,7 +198,7 @@ thunderbird
 #setup kickoff favorites
 /bin/mkdir -p /etc/skel/.config
 
-JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/ardour5.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,/usr/share/applications/org.kde.kontact.desktop
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/qjackctl.desktop,/usr/share/applications/qtractor.desktop,/usr/share/applications/frescobaldi.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/kde4/kfmclient_html.desktop,/usr/share/applications/kde4/Kontact.desktop,/usr/share/applications/kde4/ktp-contactlist.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
 cat <<EOF  >> /etc/skel/.config/kickoffrc
@@ -82,3 +215,5 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 EOF
 
 %end
+
+

fedora-live-kde.ks

@@ -12,7 +12,7 @@
 %include fedora-kde-minimization.ks
 
 # DVD payload
-part / --size=7000
+part / --size=6500
 
 %post
 %end

fedora-live-lxqt.ks

@@ -11,10 +11,6 @@
 %include fedora-live-minimization.ks
 %include fedora-lxqt-common.ks
 
-%packages
-dracut-config-generic
-%end
-
 %post
 # add initscript
 cat >> /etc/rc.d/init.d/livesys << EOF
@@ -45,8 +41,6 @@ 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/

fedora-live-mate_compiz.ks

@@ -7,7 +7,7 @@
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
-part / --size 7168
+part / --size 6144
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF

fedora-live-python-classroom.ks

@@ -6,6 +6,3 @@
 
 %include fedora-live-workstation.ks
 %include fedora-python-classroom-gnome-common.ks
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1695796
-part / --size 7168

fedora-live-robotics.ks

@@ -27,12 +27,9 @@ mercurial
 -@graphical-internet
 -@games
 -@sound-and-video
--@dial-up
--@input-methods
--@standard
 
 # Add a web browser
-@firefox
+firefox
 
 # Remove office suite
 -libreoffice-*
@@ -44,11 +41,9 @@ mercurial
 # Drop things that pull in perl
 -linux-atm
 
-# No printing or scanning
+# No printing
 -foomatic-db-ppds
 -foomatic
--sane-backends-drivers-scanners
--libsane-hpaio
 
 # Dictionaries are big
 -aspell-*
@@ -57,7 +52,6 @@ mercurial
 
 # Help and art can be big, too
 -gnome-user-docs
--gnome-getting-started-docs
 -evolution-help
 -desktop-backgrounds-basic
 -*backgrounds-extras
@@ -66,6 +60,7 @@ mercurial
 -krb5-auth-dialog
 -krb5-workstation
 -pam_krb5
+-quota
 -nano
 -dos2unix
 -finger
@@ -74,8 +69,10 @@ mercurial
 -mtr
 -pinfo
 -rsh
+-nfs-utils
 -ypbind
 -yp-tools
+-rpcbind
 -acpid
 -ntsysv
 
@@ -118,7 +115,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'org.qt-project.qtcreator.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'eclipse.desktop', 'arduino.desktop', 'gnome-terminal.desktop','nautilus.desktop', 'anaconda.desktop']
 FOE
 
 fi

fedora-live-workstation.ks

@@ -10,7 +10,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 7680
+part / --size 6656
 
 %post
 

fedora-lxqt-common.ks

@@ -19,7 +19,7 @@ gnome-keyring
 
 
 # l10n
-@lxqt-l10n
+lxqt-l10n
 lximage-qt-l10n
 obconf-qt-l10n
 pavucontrol-qt-l10n
@@ -27,7 +27,7 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
-# Text Editor
+# Editor
 enki
 
 # remove unneeded stuff to get a lightweight system

fedora-modular-container-base-minimal.ks

@@ -0,0 +1,70 @@
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
+# This base is a stripped back Fedora image without python3/dnf.
+# If you need that use the standard base image.
+
+%include fedora-modular-container-common.ks
+
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+microdnf
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+# remove some random help txt files
+rm -fv usr/share/gnupg/help*.txt
+
+# Pruning random things
+rm usr/lib/rpm/rpm.daily
+rm -rfv usr/lib64/nss/unsupported-tools/  # unsupported
+
+# Statically linked crap
+rm -fv usr/sbin/{glibc_post_upgrade.x86_64,sln}
+ln usr/bin/ln usr/sbin/sln
+
+# Remove some dnf info
+rm -rfv /var/lib/dnf
+
+# don't need icons
+rm -rfv /usr/share/icons/*
+
+#some random not-that-useful binaries
+rm -fv /usr/bin/pinky
+
+# we lose presets by removing /usr/lib/systemd but we do not care
+rm -rfv /usr/lib/systemd
+
+# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
+rm -fv /etc/localtime
+mv /usr/share/zoneinfo/UTC /etc/localtime
+rm -rfv  /usr/share/zoneinfo
+
+# Final pruning
+rm -rfv /var/cache/* /var/log/* /tmp/*
+
+%end
+
+%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
+set -eux
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in container
+# This unmounts /run (tmpfs) and then recreates the files
+# in the /run directory on the root filesystem of the container
+# NOTE: run this in nochroot because "umount" does not exist in chroot
+umount /mnt/sysimage/run
+# The file that specifies the /run/lock tmpfile is
+# /usr/lib/tmpfiles.d/legacy.conf, which is part of the systemd
+# rpm that isn't included in this image. We'll create the /run/lock
+# file here manually with the settings from legacy.conf
+# NOTE: chroot to run "install" because it is not in anaconda env
+chroot /mnt/sysimage install -d /run/lock -m 0755 -o root -g root
+
+
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816
+# NOTE: run this in nochroot because "find" does not exist in chroot
+KEEPLANG=en_US
+for dir in locale i18n; do
+    find /mnt/sysimage/usr/share/${dir} -mindepth  1 -maxdepth 1 -type d -not \( -name "${KEEPLANG}" -o -name POSIX \) -exec rm -rfv {} +
+done
+
+%end

fedora-modular-container-base.ks

@@ -0,0 +1,38 @@
+# See fedora-modular-container-common.ks for details on how to hack on container image kickstarts
+# This base is a standard Fedora image with python3 and dnf
+
+%include fedora-modular-container-common.ks
+
+%packages --excludedocs --instLangs=en --nocore
+rootfiles
+tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
+vim-minimal
+dnf
+dnf-yum  # https://pagure.io/fesco/ticket/1312#comment:29
+sssd-client
+
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+# remove some extraneous files
+rm -rf /var/cache/dnf/*
+rm -rf /tmp/*
+
+#Mask mount units and getty service so that we don't get login prompt
+systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
+# Fix /run/lock breakage since it's not tmpfs in container
+# 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
+systemd-tmpfiles --prefix=/run/ --prefix=/var/run/ --create --boot || true
+
+%end

fedora-modular-container-common.ks

@@ -0,0 +1,75 @@
+# This is the common bits between Container base images based on Modular Fedora.
+#
+# To keep this image minimal it only installs English language. You need to change
+# dnf configuration in order to enable other languages.
+#
+# ##  Hacking on this image ###
+# This kickstart is processed using Anaconda-in-ImageFactory (via Koji typically),
+# but you can run imagefactory locally too.
+#
+# To do so, testing local changes, first you'll need a TDL file.  I store one here:
+# https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
+#
+# Then, once you have imagefactory and imagefactory-plugins installed, run:
+#
+#   ksflatten -c fedora-modular-base[-minimal].ks -o fedora-modular-base-test.ks
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-modular-base-test.ks modular
+#
+
+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 container image is a tarball
+zerombr
+clearpart --all
+autopart --nohome --noswap --nolvm
+
+%packages --excludedocs --instLangs=en --nocore
+fedora-modular-release
+bash
+coreutils-single
+glibc-minimal-langpack
+libcrypt
+rpm
+shadow-utils
+sssd-client
+util-linux
+-kernel
+-dosfstools
+-e2fsprogs
+-fuse-libs
+-gnupg2-smime
+-libss # used by e2fsprogs
+-libusbx
+-pinentry
+-shared-mime-info
+-trousers
+-xkeyboard-config
+
+%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=1400682
+echo "Import RPM GPG key"
+releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
+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
+
+%end

fedora-modular-disk-minimal.ks

@@ -2,6 +2,7 @@ text
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
+auth --useshadow --passalgo=sha512
 selinux --enforcing
 # Disabled for modular compose (for now)
 #firewall --enabled --service=mdns
@@ -34,6 +35,7 @@ microdnf
 glibc-minimal-langpack
 grubby
 kernel
+libcrypt
 sssd-client
 dhcp-client
 -fedora-logos
@@ -55,9 +57,8 @@ dhcp-client
 
 # Setup Raspberry Pi firmware
 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
 
-releasever=$(rpm --eval '%{fedora}')
+releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
 rpm -qa

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-python-classroom-common.ks

@@ -13,14 +13,10 @@ vim-enhanced
 wget
 
 # Remove Pythons possibly recommended by tox
--python2
 -python26
--python27
 -python33
 -python34
 -python35
--python36
--python37
 -pypy
 
 %end

fedora-python-classroom-gnome-common.ks

@@ -7,6 +7,7 @@
 %include fedora-python-classroom-common.ks
 
 %packages
+ninja-ide
 emacs
 python3-matplotlib-tk
 python3-pillow-tk

fedora-repo.ks

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

fedora-scientific-common.ks

@@ -28,6 +28,14 @@ armadillo-devel
 ddd
 valgrind
 
+#python 2 tools/libraries not included from the groups
+python2-tools
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+python-networkx
+python-pandas
 
 #python 3 and tools/libraries not included from the groups
 python3
@@ -43,6 +51,8 @@ python3-networkx
 python3-pandas
 
 # matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-tk
 
@@ -56,20 +66,19 @@ gcc-gfortran
 # GUI for R
 rkward
 
+# GUI for Octave
+qtoctave
+
 # julia
-julia
+# Comment out till https://koji.fedoraproject.org/koji/buildinfo?buildID=1135023 is fixed
-julia-doc
+# julia
-julia-devel
+# julia-doc
 
 # IDEs for the IDE folks
 @eclipse
-
+# Workaround for: https://pagure.io/releng/issue/7814
-# Workaround for https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
-
+spyder
-python3-spyder
-python3-spyder-kernels
-
 
 #writing & publishing
 emacs
@@ -90,8 +99,9 @@ openmpi
 openmpi-devel
 valgrind-openmpi
 libgomp
+python-pp
+mpi4py-openmpi
 python3-mpi4py-openmpi
-python3-mpi4py-mpich
 
 #Version control- a GUI for each as well
 
@@ -113,6 +123,7 @@ libotf
 #root
 root
 root-gui-fitpanel
+root-python
 
 #Multiple jobs/clustering system
 # torque

fedora-soas-common.ks

@@ -9,12 +9,6 @@
 firewall --enabled --service=mdns,presence
 
 %packages
-
-# == Core Sugar Platform ==
-@sugar-desktop
-
-# explicitly remove a bunch of extra stuff
--openbox
 -@fonts
 -@dial-up
 -@multimedia
@@ -36,8 +30,7 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
--sane-backends
+-webkit2gtk3-plugin-process-gtk2
--sane-backends-drivers-scanners
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -47,12 +40,38 @@ aajohan-comfortaa-fonts
 sil-abyssinica-fonts
 vlgothic-fonts
 
+# == Core Sugar Platform ==
+@sugar-desktop
+-sugar-ruler
+sugar-cp-updater
+lightdm
+lightdm-gtk
+
 # Write breaks unless we do this (we don't need it anyway)
+# enable for testing in the F17 dev cycle
 @input-methods
 
 # Needed for wifi, bluetooth and WWAN connection support
 @networkmanager-submodules
 
+# == Platform Components ==
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
+alsa-plugins-pulseaudio
+alsa-utils
+gstreamer1-plugins-base
+gstreamer1-plugins-good
+gstreamer1-plugins-bad-free
+gstreamer-plugins-espeak
+pulseaudio
+pulseaudio-utils
+
+# explicitly remove openbox and hopefully deal with what firstboot wants
+-openbox
+
+# remove deps that come from god knows where
+-sane-backends
+-sane-backends-drivers-scanners
+
 # Usefulness for DSL connections as per:
 # http://bugs.sugarlabs.org/ticket/1951
 rp-pppoe
@@ -64,24 +83,63 @@ livecd-tools
 # Get the Sugar boot screen
 -plymouth-system-theme
 -plymouth-theme-charge
+sugar-logos
 
 %end
 
 %post
 
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
+
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
 Sugar on a Stick
 EOF
 cat /etc/fedora-release >> /boot/olpc_build
 
-# Rebuild initrd for Sugar boot screen
+# Add our activities to the favorites
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+cat > /usr/share/sugar/data/activities.defaults << EOF
-/usr/sbin/plymouth-set-default-theme sugar
+org.laptop.WebActivity
-dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+org.laptop.HelpActivity
-
+org.laptop.Chat
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
+org.laptop.sugar.ReadActivity
-rm -f /var/lib/rpm/__db*
+org.laptop.sugar.GetBooksActivity
+org.laptop.AbiWordActivity
+org.laptop.TurtleArtActivity
+org.laptop.Calculate
+org.laptop.Clock
+org.laptop.ImageViewerActivity
+org.laptop.Memorize
+org.laptop.physics
+org.laptop.Pippy
+org.laptop.RecordActivity
+org.laptop.Oficina
+org.laptop.StopWatchActivity
+org.laptop.community.Finance
+org.laptop.community.TypingTurtle
+org.laptop.sugar.Jukebox
+org.laptop.Words
+org.eq.FotoToon
+org.gnome.Labyrinth
+com.laptop.Ruler
+org.sugarlabs.AbacusActivity
+org.sugarlabs.IRC
+org.sugarlabs.InfoSlicer
+org.sugarlabs.PortfolioActivity
+org.sugarlabs.StoryActivity
+org.sugarlabs.VisualMatchActivity
+com.garycmartin.Moon
+mulawa.Countries
+tv.alterna.Clock
+vu.lux.olpc.Maze
+vu.lux.olpc.Speak
+EOF
 
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/sugar

fedora-workstation-common.ks

@@ -8,7 +8,6 @@
 # Make sure to sync any additions / removals done here with
 # workstation-product-environment in comps
 @base-x
-@container-management
 @core
 @firefox
 @fonts

l10n/fedora-live-workstation-de_CH.ks

@@ -11,7 +11,7 @@ timezone Europe/Zurich
 
 %packages
 -gnome-blog
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-de_DE.ks

@@ -11,7 +11,7 @@ timezone Europe/Berlin
 
 %packages
 -gnome-blog
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-fr_FR.ks

@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-live-workstation-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

l10n/fedora-live-workstation-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-pt_BR.ks

@@ -10,7 +10,7 @@ keyboard br-abnt2
 timezone America/Sao_Paulo
 
 %packages
-langpacks-pt_BR
+@brazilian-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-pt_PT.ks

@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-live-workstation-ru_RU.ks

@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livecd-cinnamon-de_DE.ks

@@ -13,7 +13,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-cinnamon-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

l10n/fedora-livecd-kde-de_CH.ks

@@ -10,7 +10,7 @@ keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-kde-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 
 # don't install unnecessary input methods
 -scim*

l10n/fedora-livecd-kde-fr_FR.ks

@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-kde-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

l10n/fedora-livecd-kde-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-kde-pt_PT.ks

@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-kde-ru_RU.ks

@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livecd-lxde-de_CH.ks

@@ -13,7 +13,7 @@ keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 
 # exclude input methods
 -ibus*

l10n/fedora-livecd-lxde-de_DE.ks

@@ -13,7 +13,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 
 # exclude input methods
 -ibus*

l10n/fedora-livecd-lxde-fr_FR.ks

@@ -13,7 +13,7 @@ keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

l10n/fedora-livecd-lxde-ru_RU.ks

@@ -13,7 +13,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livecd-xfce-de_CH.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang de_DE
 keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-de_DE.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-fr_FR.ks

@@ -6,14 +6,14 @@
 # Maintainer(s):
 # - Matthieu Saulnier <fantom@fedoraproject.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang fr_FR.UTF-8
 keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-langpacks-fr
+@french-support
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-langpacks-ja
+@japanese-support
 # exclude input methods except ibus:
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-nl_NL.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang nl_NL
 keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-pt_PT.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Pedro Silva <pedrofsilva a netcabo.pt>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang pt_PT.UTF-8
 keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ru_RU.ks

@@ -3,14 +3,14 @@
 # Maintainer(s):
 # - Sergey Mihailov <sergey.mihailov at gmail.com>
 
-%include ../fedora-live-xfce.ks
+%include ../fedora-livecd-xfce.ks
 
 lang ru_RU.UTF-8
 keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livedvd-electronic-lab-de_CH.ks

@@ -10,7 +10,7 @@ keyboard sg-latin1
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-pt_PT.ks

@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-electronic-lab-ru_RU.ks

@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

l10n/fedora-livedvd-games-de_CH.ks

@@ -10,7 +10,7 @@ keyboard sg-latin1
 timezone Europe/Zurich
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-langpacks-de
+@german-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-ja_JP.ks

@@ -1,40 +0,0 @@
-# fedora-livedvd-games-ja_JP.ks
-#
-# Description:
-# - Japanese Fedora Live Spin with the game Desktop Environment
-# 
-# Maintainer(s):
-# - Mika Tsukada  <mika.tsukada@miraclelinux.com>
-
-%include ../fedora-live-games.ks
-
-lang ja_JP.UTF-8
-keyboard ja
-timezone Asia/Tokyo
-
-%packages
-langpacks-ja
-# exclude input methods except ibus:
--m17n*
--scim*
--iok
-glibc-langpack-ja
-# ibus-stuff
-ibus-kkc
-ibus-mozc
-%end
-
-%post
-cat > /etc/X11/xorg.conf.d/00-keyboard.conf << "EOF"
-# Read and parsed by systemd-localed. It's probably wise not to edit this file
-# manually too freely.
-Section "InputClass"
-        Identifier "system-keyboard"
-        MatchIsKeyboard "on"
-        Option "XkbLayout" "jp"
-        Option "XkbModel" "jp106"
-EndSection
-EOF
-%end
-
-

l10n/fedora-livedvd-games-nl_NL.ks

@@ -10,7 +10,7 @@ keyboard us
 timezone Europe/Amsterdam
 
 %packages
-langpacks-nl
+@dutch-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-pt_PT.ks

@@ -10,7 +10,7 @@ keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-langpacks-pt
+@portuguese-support
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livedvd-games-ru_RU.ks

@@ -10,7 +10,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-langpacks-ru
+@russian-support
 hunspell-ru
 
 # exclude input methods

maintainers.toml

@@ -1,68 +0,0 @@
-[spins.lxqt.x86_64]
-fas = [ "lupinix", "zsun" ]
-maintainers = [ "Christian Dersch", "Zamir SUN" ]
-[spins.lxqt.armhfp]
-fas = [ "lupinix", "zsun" ]
-maintainers = [ "Christian Dersch", "Zamir SUN" ]
-
-[spins.xfce.x86_64]
-fas = [ "nonamedotc", "kevin", "maxamillion" ]
-maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ]
-[spins.xfce.armhfp]
-fas = [ "nonamedotc", "kevin", "maxamillion" ]
-maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ]
-
-[spins.kde.x86_64]
-fas = [ "rdieter", "svahl" ]
-maintainers = [ "Rex Dieter", "Sebastian Vahl" ]
-
-[spins.cinnamon.x86_64]
-fas = [ "grinnz" ]
-maintainers = [ "Dan Book" ]
-
-[spins.lxde.x86_64]
-fas = [ "cwickert" ]
-maintainers = [ "Christoph Wickert" ]
-[spins.lxde.armhfp]
-fas = [ "cwickert" ]
-maintainers = [ "Christoph Wickert" ]
-
-[spins.soas.x86_64]
-fas = [ "chimosky", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Peter Robinson" ]
-[spins.soas.armhfp]
-fas = [ "chimosky", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Peter Robinson" ]
-
-
-[labs.astronomy_kde.x86_64]
-fas = [ "lupinix" ]
-maintainers = [ "Christian Dersch" ]
-
-[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" ]
-
-[labs.design_suite.x86_64]
-fas = [ "luya" ]
-maintainers = [ "Luya Tshimbalanga" ]
-
-[labs.games.x86_64]
-fas = [ "dagostinelli" ]
-maintainers = [ "Darryl T. Agostinelli" ]
-
-[labs.jam_kde.x86_64]
-fas = [ "eeickmeyer" ]
-maintainers = [ "Erich Eickmeyer" ]
-
-[labs.scientific_kde.x86_64]
-fas = [ "scitech" ]
-maintainers = [ "SciTech SIG" ]
-
-[labs.scientific.x86_64]
-fas = [ "scitech" ]
-maintainers = [ "SciTech SIG" ]