Bump KDE live root partition size to 7G

This is needed for current F33, 6.5G is too small. The live image
creation hangs near the end. Just noticed this after enabling
KDE live image build test for F33 updates.

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

README.md

@@ -1,13 +1,15 @@
 # fedora-kickstarts #
 
-This project is used to manage the Fedora kickstart files used in composing Fedora release images. 
+This project is used to manage the Fedora kickstart files used in composing Fedora release images.
 
-The master branch is used by rawhide and each release branch is used by that release. 
+The master branch is used by rawhide and each release branch is used by that release.
 
-All changes should be made via the PR workflow. 
+All changes should be made via the PR workflow.
 
-This project is packaged in Fedora as the spin-kickstarts package allowing users to see 
-and modify the kickstart files for their local needs. 
+This project is packaged in Fedora as the spin-kickstarts package allowing users to see
+and modify the kickstart files for their local needs.
+
+Maintainers for each image are listed in the `maintainers.toml` file.
 
 ## To make a release ##
 
@@ -24,6 +26,18 @@ and modify the kickstart files for their local needs.
     # Clean up the generated files:
     make clean
 
+## Build logs ##
+
+To see build logs go to
+
+https://koji.fedoraproject.org/koji
+
+"Packages" tab, and filter by Fedora-Workstation-Live for example.
+
+Technical info about the officialy released images can be found at
+
+https://kojipkgs.fedoraproject.org/compose/
+
 # bug reports #
 
 Bugs should be reported to the spin-kickstarts bugzilla component:

fedora-arm-base.ks

@@ -1,20 +1,17 @@
-lang en_US.UTF-8
 #keyboard us
-auth --useshadow --passalgo=sha512
+lang en_US.UTF-8
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
-bootloader --location=mbr
+bootloader --extlinux --location=mbr
 
-part /boot/fw --size=30 --fstype vfat --asprimary
+part /boot/efi --size=80 --fstype vfat --asprimary
 part /boot --size=512 --fstype ext4 --asprimary
-part swap --size=512 --fstype swap --asprimary
-part / --size=2800 --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,rsyslog,chronyd,initial-setup
+services --enabled=sshd,NetworkManager,avahi-daemon,chronyd,initial-setup
 
 %include fedora-repo.ks
 
@@ -39,30 +36,27 @@ initial-setup-gui
 -iwl*
 -ipw*
 -usb_modeswitch
--iproute-tc
 #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 -Pr /usr/share/bcm283x-firmware/* /boot/fw/
-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/fw/rpi3-u-boot.bin
-sed -i '/vfat/ d' /etc/fstab
+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 -q --qf '%{version}\n' fedora-release)
+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
+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*
 
@@ -76,13 +70,8 @@ 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-kde.ks

@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-common.ks
 
-part / --size=6300 --fstype ext4
+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
 

fedora-arm-lxde.ks

@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxde-common.ks
 
-part / --size=4000 --fstype ext4
+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
 

fedora-arm-lxqt.ks

@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 
-part / --size=4200 --fstype ext4 --asprimary
+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

fedora-arm-mate.ks

@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks
 
-part / --size=6000 --fstype ext4
+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
 

fedora-arm-minimal.ks

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

fedora-arm-python-classroom.ks

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

fedora-arm-server.ks

@@ -4,6 +4,7 @@
 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

fedora-arm-soas.ks

@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-soas-common.ks
 
-part / --size=3300 --fstype ext4 --asprimary
+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
 

fedora-arm-workstation.ks

@@ -2,11 +2,16 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-common.ks
 
-part / --size=6200 --fstype ext4
+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
 

fedora-arm-xbase.ks

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

fedora-arm-xfce.ks

@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks
 
-part / --size=4700 --fstype ext4
+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
 

fedora-atomic-vagrant.ks

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

@@ -1,157 +0,0 @@
-# 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/atomic/repo/ --ref=fedora/rawhide/${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 fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
-
-# 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

@@ -8,11 +8,14 @@
 
 %packages
 
+fedora-release-cinnamon
 @networkmanager-submodules
 @cinnamon-desktop
 @libreoffice
+parole
+rhythmbox
 
 # extra backgrounds
-f28-backgrounds-extras-gnome
+f33-backgrounds-extras-gnome
 
 %end

fedora-cloud-atomic-pxetolive.ks

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

fedora-cloud-base-gcp.ks

@@ -0,0 +1,25 @@
+# This is a basic Fedora cloud spin designed to work with GCP.
+# Note that GCP prefers UEFI so we'll need to make sure this image
+# is created from a machine that is started in UEFI mode.
+
+# Inherit from cloud base
+%include fedora-cloud-base.ks
+
+# Change serial port configuration to recommended default for GCP (ttyS0,38400n8d)
+# Don't show bootloader as it's impossible for the user to get to it in time
+# So we might as well not waste the 1 second on each boot.
+# https://cloud.google.com/compute/docs/import/import-existing-image
+bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
+
+#%packages
+#%end
+
+%post --erroronfail
+cat <<EOF > /etc/NetworkManager/conf.d/gcp-mtu.conf
+# In GCP it is recommended to use 1460 as the MTU.
+# Set it to 1460 for all connections.
+# https://cloud.google.com/network-connectivity/docs/vpn/concepts/mtu-considerations
+[connection]
+ethernet.mtu = 1460
+EOF
+%end

fedora-cloud-base-vagrant.ks

@@ -53,6 +53,12 @@ EOKEYS
 chmod 600 ~vagrant/.ssh/authorized_keys
 chown -R vagrant:vagrant ~vagrant/.ssh/
 
+cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf <<EOF
+# For now the vagrant insecure key is an rsa key
+# https://github.com/hashicorp/vagrant/issues/11783
+PubkeyAcceptedKeyTypes=+ssh-rsa
+EOF
+
 # Further suggestion from @purpleidea (James Shubin) - extend key to root users as well
 mkdir -m 0700 -p /root/.ssh
 cp /home/vagrant/.ssh/authorized_keys /root/.ssh/authorized_keys

fedora-cloud-base.ks

@@ -4,9 +4,6 @@
 # keys. Cloud-init creates a user account named "fedora" with passwordless
 # sudo access. The root password is empty and locked by default.
 #
-# Note that unlike the standard Fedora install, this image has /tmp on disk
-# rather than in tmpfs, since memory is usually at a premium.
-#
 # This kickstart file is designed to be used with ImageFactory (in Koji).
 #
 # To do a local build, you'll need to install ImageFactory.  See
@@ -15,9 +12,9 @@
 # For a TDL file, I store one here:
 # https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 # (Koji generates one internally...what we really want is Koji to publish it statically)
-# 
+#
 # Once you have imagefactory and imagefactory-plugins installed, run:
-# 
+#
 #   curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl
 #   tempfile=$(mktemp --suffix=.ks)
 #   ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile}
@@ -29,7 +26,6 @@ lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
 
-auth --useshadow --passalgo=sha512
 selinux --enforcing
 rootpw --lock --iscrypted locked
 
@@ -38,7 +34,6 @@ 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"
 
-network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
@@ -49,218 +44,78 @@ autopart --noboot --nohome --noswap --nolvm
 
 reboot
 
-# Package list.
-# FIXME: instLangs does not work, so there's a hack below
-# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
-# FIXME: instLangs bug has been fixed but now having instLangs
-# with an arg causes no langs to get installed because of BZ1262040
-# which yields the errors in BZ1261249. For now fix by not using
-# --instLangs at all
-#%packages --instLangs=en
-%packages
+##### begin package list #############################################
+%packages --instLangs=en
 
-kernel-core
+# Include packages for the cloud-server-environment group
 @^cloud-server-environment
-# Need to pull in the udev subpackage
-systemd-udev
 
-# after move away from grub2 - let's add 'which' back
-which
+# Don't include the kernel toplevel package since it pulls in
+# kernel-modules. We're happy for now with kernel-core.
+-kernel
+kernel-core
 
-# rescue mode generally isn't useful in the cloud context
+# 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
 
-# Some things from @core we can do without in a minimal install
--biosdevname
-# Need to also add back plymouth in order to mask failure of
-# systemd-vconsole-setup.service. BZ#1272684. Comment out for now
-#-plymouth
--NetworkManager
--iprutils
-# Now that BZ#1199868 is fixed kbd really gets removed but it breaks
-# systemd-vconsole-setup.service on boot. Comment out for now
-#-kbd
--uboot-tools
--kernel
-# No need for plymouth. Also means anaconda won't put rhgb/quiet
-# on kernel command line
+# Plymouth provides a graphical boot animation. In the cloud we don't
+# need a graphical boot animation. This also means anaconda won't put
+# rhgb/quiet on kernel command line
 -plymouth
 
+# 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
 %end
+##### end package list ###############################################
 
 
-
+##### begin kickstart post ###########################################
 %post --erroronfail
 
-# Create grub.conf for EC2. This used to be done by appliance creator but
-# anaconda doesn't do it. And, in case appliance-creator is used, we're
-# overriding it here so that both cases get the exact same file.
-# Note that the console line is different -- that's because EC2 provides
-# different virtual hardware, and this is a convenient way to act differently
-echo -n "Creating grub.conf for pvgrub"
-rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
-mkdir /boot/grub
-echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
-for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
-  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
-  echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
-  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
-  echo
-done
-
-
-#link grub.conf to menu.lst for ec2 to work
-echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
-ln -sf grub.conf /boot/grub/menu.lst
-ln -sf /boot/grub/grub.conf /etc/grub.conf
-
-# older versions of livecd-tools do not follow "rootpw --lock" line above
-# https://bugzilla.redhat.com/show_bug.cgi?id=964299
-passwd -l root
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# this is installed by default but we don't need it in virt
-# Commenting out the following for #1234504
-# rpm works just fine for removing this, no idea why dnf can't cope
+# linux-firmware is installed by default and is quite large. As of mid 2020:
+#   Total download size: 97 M
+#   Installed size: 268 M
+# So far we've been fine shipping without it so let's continue.
+# More discussion about this in #1234504.
 echo "Removing linux-firmware package."
 rpm -e linux-firmware
 
-# Remove firewalld; was supposed to be optional in F18+, but is pulled in
-# in install/image building.
-echo "Removing firewalld."
-# FIXME! clean_requirements_on_remove is the default with DNF, but may
-# not work when package was installed by Anaconda instead of command line.
-# Also -- check if this is still even needed with new anaconda -- disabled
-# firewall should _not_ pull in this package.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-dnf -C -y erase "firewalld*"
-
-# Another one needed at install time but not after that, and it pulls
-# in some unneeded deps (like, newt and slang)
-echo "Removing authconfig."
-dnf -C -y erase authconfig
-
-# instlang hack. (Note! See bug referenced above package list)
-find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
-localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
-# this will kill a live system (since it's memory mapped) but should be safe offline
-mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-build-locale-archive
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
-
-
-echo -n "Getty fixes"
-# although we want console output going to the serial console, we don't
-# actually have the opportunity to login there. FIX.
-# we don't really need to auto-spawn _any_ gettys.
-sed -i '/^#NAutoVTs=.*/ a\
-NAutoVTs=0' /etc/systemd/logind.conf
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-DEVTIMEOUT=10
-EOF
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-PERSISTENT_DHCLIENT="yes"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# Uncomment this if you want to use cloud init but suppress the creation
-# of an "ec2-user" account. This will, in the absence of further config,
-# cause the ssh key from a metadata source to be put in the root account.
-#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
-#users: []
-#disable_root: 0
-#EOF
-
+# See the systemd-random-seed.service man page that says:
+#   " It is recommended to remove the random seed from OS images intended
+#     for replication on multiple systems"
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/systemd/random-seed
 
-echo "Cleaning old dnf repodata."
-# FIXME: clear history?
-dnf clean all
-truncate -c -s 0 /var/log/dnf.log
-truncate -c -s 0 /var/log/dnf.rpm.log
-
 echo "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-# FIXME: is this still needed?
-echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-# ignore return code because UEFI systems with vfat filesystems
-# that don't support selinux will give us errors
-/usr/sbin/fixfiles -R -a restore || true
-
 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.)"
 
-# When we build the image with oz, dracut is used 
-# and sets up a ifcfg-en<whatever> for the device. We don't 
-# want to use this, we use eth0 so it is always the same. 
-# So we remove all these ifcfg-en<whatever> devices so 
-# The 'network' service can come up cleanly.
-rm -f /etc/sysconfig/network-scripts/ifcfg-en*
+# 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
 
-# Enable network service here, as doing it in the services line
-# fails due to RHBZ #1369794
-/sbin/chkconfig network on
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-# 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
+# Clear machine-id on pre generated images
+truncate -s 0 /etc/machine-id
 
 %end
-
+##### end kickstart post ############################################

fedora-cloud-bigdata.ks

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

fedora-cloud-experimental.ks

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

fedora-comp-neuro-common.ks

@@ -0,0 +1,48 @@
+# 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
+arbor
+auryn-mpich
+auryn-openmpi
+bionetgen
+calcium-calculator
+COPASI
+qalculate
+getdp
+genesis-simulator
+gnuplot
+moose
+nest
+neuron
+octave
+# paraview
+python3
+python3-brian2
+python-brian2-doc
+python3-ipython
+python3-nest
+python3-neuron
+python3-libNeuroML
+python3-neo
+# Currently broken in rawhide
+# python3-nineml
+# python-nineml-doc
+python3-PyLEMS
+python-PyLEMS-doc
+python3-steps
+smoldyn
+
+%end

fedora-container-base-minimal.ks

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

fedora-container-base.ks

@@ -1,9 +1,9 @@
-# See docker-base-common.ks for details on how to hack on docker image kickstarts
+# See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora image with python3 and dnf
 
-%include fedora-docker-common.ks
+%include fedora-container-common.ks
 
-%packages --excludedocs --instLangs=en --nocore
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 rootfiles
 # https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
 fedora-repos-modular
@@ -12,7 +12,10 @@ vim-minimal
 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
@@ -23,8 +26,6 @@ rm -rf /tmp/*
 # https://pagure.io/atomic-wg/issue/308
 printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 
-#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 docker
@@ -38,7 +39,21 @@ systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connec
 #   [/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
 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-container-common.ks

@@ -1,4 +1,4 @@
-# This is the common bits between Fedora Docker base image.
+# This is the common bits between Fedora Container base image.
 #
 # To keep this image minimal it only installs English language. You need to change
 # dnf configuration in order to enable other languages.
@@ -12,8 +12,8 @@
 #
 # Then, once you have imagefactory and imagefactory-plugins installed, run:
 #
-#   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-docker-base-test.ks docker
+#   ksflatten -c fedora-container-base[-minimal].ks -o fedora-container-base-test.ks
+#   imagefactory --debug target_image --template /path/to/fedora-atomic-rawhide.tdl --parameter offline_icicle true --file-parameter install_script $(pwd)/fedora-container-base-test.ks docker
 #
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
@@ -29,12 +29,11 @@ zerombr
 clearpart --all
 autopart --noboot --nohome --noswap --nolvm
 
-%packages --excludedocs --instLangs=en --nocore
-fedora-release
+%packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
+fedora-release-container
 bash
-coreutils-single
+coreutils
 glibc-minimal-langpack
-libcrypt
 rpm
 shadow-utils
 sssd-client
@@ -49,6 +48,7 @@ util-linux
 -shared-mime-info
 -trousers
 -xkeyboard-config
+-grubby
 
 %end
 
@@ -60,9 +60,12 @@ 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 -q --qf '%{version}\n' fedora-release)
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab

fedora-disk-base.ks

@@ -11,7 +11,6 @@ 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
@@ -40,34 +39,42 @@ dracut-config-generic
 -dracut-config-rescue
 # install tools needed to manage and boot arm systems
 @arm-tools
--uboot-images-armv7
 rng-tools
 chrony
 bcm283x-firmware
 initial-setup
+# Intel wireless firmware assumed never of use for disk images
 -iwl*
 -ipw*
--trousers-lib
 -usb_modeswitch
--iproute-tc
 -generic-release*
 
-# make sure all the locales are available for inital0-setup and anaconda to work
+# make sure all the locales are available for inital-setup and anaconda to work
 glibc-all-langpacks
 
 %end
 
 %post
 
-# Setup Raspberry Pi firmware
-cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+# Find the architecture we are on
+arch=$(uname -m)
 
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
+# Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
+if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
+else
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
+fi
+
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
-rpm -qa
+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*
 

fedora-disk-minimal.ks

@@ -3,7 +3,7 @@
 
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
 
-autopart --type=plain
+autopart --type=plain --noswap
 
 %packages
 -xkeyboard-config

fedora-disk-server.ks

@@ -2,15 +2,22 @@
 
 services --enabled=sshd,NetworkManager,chronyd,initial-setup
 
-autopart
+autopart --noswap
 
 %packages
-# install the default groups for the server evironment since installing the environment is not working
+fedora-release-server
+# install the default groups for the server environment since installing the environment is not working
 @server-product
 @standard
+@core
 @headless-management
+@hardware-support
+@networkmanager-submodules
+
 @container-management
 @domain-client
+@guest-agents
+@server-hardware-support
 -initial-setup-gui
 -generic-release*
 %end

fedora-disk-workstation.ks

@@ -6,7 +6,7 @@ bootloader --append="cma=256MB"
 
 services --enabled=sshd,NetworkManager,chronyd
 
-autopart --type=plain
+autopart --type=btrfs --noswap
 
 %packages
 -initial-setup

fedora-disk-xfce.ks

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

fedora-iot.ks

@@ -0,0 +1,107 @@
+# This is the kickstart for Fedora IoT disk images.
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --enabled=NetworkManager,sshd,rngd
+
+zerombr
+clearpart --all --initlabel --disklabel=msdos
+autopart --nohome --noswap --type=plain
+
+# Equivalent of %include fedora-repo.ks
+# Pull from the ostree repo that was created during the compose
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
+
+reboot
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+if [[ $arch == "armv7l" ]]; then
+	arch="armhfp"
+fi
+
+# Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
+if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
+else
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
+fi
+
+# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
+# We want consumers of this image to track the two week releases.
+ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${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"
+
+# Remove the old ref so that the commit eventually gets cleaned up.
+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'
+
+# We're getting a stray console= from somewhere, work around it
+rpm-ostree kargs --delete=console=tty0
+
+# older versions of livecd-tools do not follow "rootpw --lock" line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
+cp /etc/skel/.bash* /var/roothome
+
+# Remove any persistent NIC rules generated by udev
+rm -vf /etc/udev/rules.d/*persistent-net*.rules
+# 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
+
+echo "Packages within this iot image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+# For trac ticket https://pagure.io/atomic-wg/issue/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
+
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
+%end

fedora-kde-common.ks

@@ -5,8 +5,8 @@
 @kde-desktop
 @kde-media
 @kde-office
-@kde-telepathy
 @networkmanager-submodules
+fedora-release-kde
 
 ### The KDE-Desktop
 

fedora-live-astronomy_kde.ks

@@ -34,9 +34,7 @@ astrometry
 astrometry-tycho2
 cdsclient
 fpack
-gcx
 psfex
-saoimage
 scamp
 sextractor
 siril
@@ -54,7 +52,7 @@ indistarter
 kstars
 
 # misc. astronomy
-celestia
+#celestia
 stellarium
 virtualplanet
 
@@ -107,6 +105,10 @@ python3-matplotlib-tk
 # Python IDE very useful for scientific use
 python3-spyder
 
+# BOINC for distributed computing
+boinc-client
+boinc-manager
+
 #Version control- a GUI for each as well
 
 # Installing rapidsvn will also install subversion package

fedora-live-base.ks

@@ -10,7 +10,6 @@
 lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
-auth --useshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
@@ -45,22 +44,32 @@ 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
+# Anaconda has a weak dep on this and we don't want it on livecds, see
+# https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
+-fcoe-utils
+-device-mapper-multipath
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
-syslinux
+# syslinux is in @x86-baremetal-tools
 
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks
+
+# no longer in @core since 2018-10, but needed for livesys script
+initscripts
+chkconfig
 %end
 
 %post
@@ -95,21 +104,14 @@ livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
   if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
     livedir=\${arg##rd.live.dir=}
-    return
+    continue
   fi
   if [ "\${arg##live_dir=}" != "\${arg}" ]; then
     livedir=\${arg##live_dir=}
-    return
   fi
 done
 
-# enable swaps unless requested otherwise
-swaps=\`blkid -t TYPE=swap -o device\`
-if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
-  for s in \$swaps ; do
-    action "Enabling swap partition \$s" swapon \$s
-  done
-fi
+# enable swapfile if it exists
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
   action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
 fi
@@ -154,7 +156,6 @@ findPersistentHome() {
   for arg in \`cat /proc/cmdline\` ; do
     if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
       homedev=\${arg##persistenthome=}
-      return
     fi
   done
 }
@@ -221,7 +222,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
-echo "localhost-live" > /etc/hostname
+hostnamectl set-hostname "localhost-live"
 
 EOF
 
@@ -301,11 +302,11 @@ EOF
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
+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
+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*
 
@@ -344,8 +345,19 @@ cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+    # 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
 fi
 
 %end

fedora-live-cinnamon.ks

@@ -7,10 +7,9 @@
 # - Dan Book <grinnz@grinnz.com>
 
 %include fedora-live-base.ks
-%include fedora-live-minimization.ks
 %include fedora-cinnamon-common.ks
 
-part / --size=6144
+part / --size=8192
 
 %post
 # cinnamon configuration

fedora-live-comp_neuro.ks

@@ -0,0 +1,12 @@
+# Description: The Workstation based NeuroFedora computational neuroscience lab image.
+# https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
+#
+# Maintained by the NeuroFedora SIG:
+# https://fedoraproject.org/wiki/SIGs/NeuroFedora
+# mailto:neuro-sig@lists.fedoraproject.org
+
+%include fedora-live-workstation.ks
+%include fedora-comp-neuro-common.ks
+%include fedora-neuro-gnome-common.ks
+
+part / --size 10240

fedora-live-design_suite.ks

@@ -17,8 +17,8 @@ part / --size 14336
 @design-suite
 
 # Provides backup application
-deja-dup
-deja-dup-nautilus
+#deja-dup
+#deja-dup-nautilus
 
 # Add extra gnome applications
 gnome-books
@@ -32,14 +32,19 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-# f26-backgrounds-extras-base
-# f26-backgrounds-extras-gnome
+f33-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop
 
+# temporarily removing conflicting applications
+-blender-luxcorerender
+-mypaint
+-shutter
+-sparkleshare
+
 %end
 
 %post

fedora-live-games.ks

@@ -1,8 +1,16 @@
-# fedora-livedvd-games.ks
+# fedora-live-games.ks
 #
-# Maintainer(s):
+# Maintainer:
+# - Darryl T. Agostinelli <dagostinelli@gmail.com>
+#   https://fedoraproject.org/wiki/User:Dagostinelli
+#
+# Former Maintainers:
 # - Bruno Wolff III <bruno@wolff.to>
-# - Formerly maintained by Rahul Sundaram
+#   https://fedoraproject.org/wiki/User:Bruno
+#
+# - Rahul Sundaram <sundaram@fedoraproject.org>
+#   https://fedoraproject.org/wiki/User:Sundaram
+#
 
 %include fedora-live-xfce.ks
 
@@ -37,7 +45,6 @@ asc-music
 astromenace
 # beneath-a-steel-sky-cd scummvm games cut for size
 boswars
-btanks
 bzflag
 crossfire-client
 extremetuxracer
@@ -48,20 +55,20 @@ freedoom
 freedroidrpg
 frozen-bubble
 gl-117
-glob2
+# glob2 - currently broken
 lincity-ng
-tmw
+#tmw - currently broken
 #maniadrive - currently broken
 #maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
-#neverball #cut for size
+neverball
 nogravity
 #pinball # Would pull in fluid-soundfont-lite-patches
 scorched3d
 # supertux # Crashing
-#supertuxkart #remove for size
+supertuxkart
 ultimatestunts
 warzone2100
 wesnoth
@@ -84,12 +91,11 @@ glaxium
 gnubg
 gnugo
 haxima
-hedgewars
+#hedgewars -- broken
 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
@@ -99,9 +105,8 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-rogue
+# rogue # recently abandoned. Someone picked it up. Waiting for approval.
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
-seahorse-adventures
 solarwolf
 sopwith
 stormbaancoureur
@@ -113,7 +118,6 @@ 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
@@ -130,14 +134,13 @@ KoboDeluxe
 Maelstrom
 methane
 njam
-seahorse-adventures
 shippy
 tecnoballz
 wordwarvi
 xgalaxy
 # zasx # Would pull in fluid-soundfont-lite-patches
 
-# falling blocks games (small) 
+# falling blocks games (small)
 
 amoebax
 crack-attack
@@ -152,9 +155,7 @@ pingus
 
 # puzzles (small)
 
-escape
 # gbrainy Removed for space - only game that pulls in mono
-magicor
 mirrormagic
 pipenightdreams
 pipepanic
@@ -164,15 +165,11 @@ vodovod
 
 # card games
 
-#poker2d - dropped from F14 for being orphaned
 PySolFC
 
 # educational/simulation
 
-bygfoot
-celestia
-childsplay
-gcompris
+#celestia - not currently building
 planets
 tuxpaint
 tuxpaint-stamps
@@ -181,15 +178,13 @@ 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,9 +7,7 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 
-# Maintainer: Jørn Lomax <northlomax@gmail.com>
-#             https://fedoraproject.org/wiki/User:jvlomax
-#             Brendan Jones <brendan.jones.it@gmail.com>
+# Maintainer: Erich Eickmeyer <erich@ericheickmeyer.com>
 
 %include fedora-live-kde.ks
 
@@ -20,123 +18,10 @@ part / --size 10240 --fstype ext4
 bootloader --append="threadirqs"
 
 %packages
+@audio
 
-#alsa
-alsa-firmware
-alsa-tools
-alsa-utils
-alsamixergui
-alsa-plugins-jack
-alsa-plugins-pulseaudio
-alsa-plugins-usbstream
-alsa-plugins-samplerate
-alsa-plugins-upmix
-alsa-plugins-vdownmix
-a2jmidid
-aj-snapshot
-
-#jack 
-jack-audio-connection-kit
-jack-audio-connection-kit-dbus
-qjackctl
-jackctlmmc
-ffado
-
-#pulse
-pulseaudio-module-jack
-pavucontrol
-
-#midi
-qsynth
-fluidsynth
-fluid-soundfont-gm
-fluidsynth-dssi
-timidity++
-qmidiarp
-vmpk
-harmonyseq
-
-#synthesis
-hydrogen
-bristol
-monobristol
-zynaddsubfx
-yoshimi
-swami
-Add64
-synthv1
-samplv1
-drumkv1
-ams
-
-#guitar
-rakarrack
-guitarix
-tuxguitar
-sooperlooper
-
-#recodring and DAW
-audacity
-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
+#pipewire
+pipewire
 
 #sound analasys, none of these are packaged yet
 #praat bug_id=666656
@@ -147,35 +32,15 @@ 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
 
@@ -184,12 +49,15 @@ kernel-tools
 firefox
 thunderbird
 
-#remove packages not need
-#-kdesdk-umbrello
-#-kdesdk-kcachegrindy
-
-#-kdesdk-kompare
-#-kdepim
+#remove packages not needed
+-akregator
+-kaddressbook
+-kmail
+-kontact
+-korganizer
+-non-mixer
+-non-session-manager
+-non-sequencer
 
 %end
 
@@ -198,7 +66,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/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
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/studio-controls.desktop,/usr/share/applications/ardour6.desktop,/usr/share/applications/carla.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop
 JAMFAVORITESLIVE=/usr/share/applications/liveinst.desktop,$JAMFAVORITES
 
 cat <<EOF  >> /etc/skel/.config/kickoffrc

fedora-live-kde.ks

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

fedora-live-lxqt.ks

@@ -11,6 +11,10 @@
 %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
@@ -41,6 +45,8 @@ 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 6144
+part / --size 8192
 
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF

fedora-live-minimization.ks

@@ -5,11 +5,8 @@
 
 # save some space
 -mpage
--sox
 -hplip
--numactl
 -isdn4k-utils
--autofs
 
 # scanning takes quite a bit of space :/
 -xsane

fedora-live-python-classroom.ks

@@ -5,5 +5,7 @@
 # The Workstion based Python Classroom Lab
 
 %include fedora-live-workstation.ks
-%include fedora-live-minimization.ks
 %include fedora-python-classroom-gnome-common.ks
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1695796
+part / --size 8192

fedora-live-robotics.ks

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

fedora-live-soas.ks

@@ -5,8 +5,6 @@
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
-# - Mel Chua <mchua AT fedoraproject DOT org>
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks

fedora-live-workstation.ks

@@ -10,7 +10,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 6656
+part / --size 7680
 
 %post
 
@@ -56,7 +56,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', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up

fedora-live-xfce.ks

@@ -13,6 +13,9 @@
 %include fedora-live-minimization.ks
 %include fedora-xfce-common.ks
 
+# need a bigger /
+part / --size 6144
+
 %post
 # xfce configuration
 

fedora-lxqt-common.ks

@@ -5,6 +5,7 @@
 #
 # Maintainer(s):
 # – Christian Dersch <lupinix@fedoraproject.org>
+# – Zamir SUN <zsun@fedoraproject.org>
 #
 
 %packages
@@ -18,7 +19,7 @@ gnome-keyring
 
 
 # l10n
-lxqt-l10n
+@lxqt-l10n
 lximage-qt-l10n
 obconf-qt-l10n
 pavucontrol-qt-l10n
@@ -26,6 +27,9 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
+# Text Editor
+enki
+
 # remove unneeded stuff to get a lightweight system
 # fonts (we make no bones about admitting we're english-only)
 wqy-microhei-fonts          # a compact CJK font, to replace:
@@ -34,14 +38,15 @@ wqy-microhei-fonts          # a compact CJK font, to replace:
 -adobe-source-han-sans-cn-fonts     # simplified Chinese
 -adobe-source-han-sans-tw-fonts     # traditional Chinese
 
--paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
+-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
 #-stix-fonts        # mathematical symbols
 
 # remove input methods to free space
 -@input-methods
 -scim*
 -m17n*
--ibus*
+# Temporary include ibus to workaround RHBZ 1633225
+# -ibus*
 -iok
 
 # Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132

fedora-mate-common.ks

@@ -1,4 +1,5 @@
 %packages
+fedora-release-matecompiz
 @mate
 compiz
 compiz-plugins-main
@@ -15,10 +16,6 @@ emerald
 fusion-icon
 @networkmanager-submodules
 
-# some apps from mate-applications
-caja-actions
-mate-disk-usage-analyzer
-
 # blacklist applications which breaks mate-desktop
 -audacious
 
@@ -35,15 +32,14 @@ nss-mdns
 # Drop things for size
 -@3d-printing
 -brasero
--colord
 -fedora-icon-theme
 -gnome-icon-theme
 -gnome-icon-theme-symbolic
+-gnome-logs
 -gnome-software
 -gnome-user-docs
 
 -@mate-applications
--mate-icon-theme-faenza
 
 # Help and art can be big, too
 -gnome-user-docs

fedora-minimal-common.ks

@@ -3,6 +3,10 @@
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
+# recommended by iproute, we don't want it in minimal
+-iproute-tc
+# recommended by gnutls, we don't want it in minimal
+-trousers
 glibc-langpack-en
 iw
 NetworkManager-wifi

fedora-modular-container-base-minimal.ks

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

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

@@ -1,75 +0,0 @@
-# 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,12 +2,12 @@ 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
 # Disabled for modular compose (for now)
-#services --enabled=sshd,NetworkManager,chronyd,initial-setup
+#services --enabled=sshd,chronyd,initial-setup
+services --enabled=NetworkManager
 network --bootproto=dhcp --device=link --activate
 rootpw --lock --iscrypted locked
 shutdown
@@ -35,9 +35,8 @@ microdnf
 glibc-minimal-langpack
 grubby
 kernel
-libcrypt
 sssd-client
-dhcp-client
+@networkmanager-submodules
 -fedora-logos
 -coreutils
 -dosfstools
@@ -55,15 +54,25 @@ dhcp-client
 
 %post
 
-# Setup Raspberry Pi firmware
-#cp -Pr /usr/share/bcm283x-firmware/* /boot/efi/
-mv -f /boot/efi/config-64.txt /boot/efi/config.txt
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+# Find the architecture we are on
+arch=$(uname -m)
 
-releasever=$(rpm -q --qf '%{version}\n' fedora-modular-release)
+# Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
+if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
+else
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
+fi
+
+releasever=$(rpm --eval '%{fedora}')
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 echo "Packages within this disk image"
-rpm -qa
+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*
 

fedora-neuro-gnome-common.ks

@@ -0,0 +1,30 @@
+# 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,10 +13,23 @@ vim-enhanced
 wget
 
 # Remove Pythons possibly recommended by tox
+-python2
 -python26
+-python27
 -python33
 -python34
 -python35
+-python36
+-python37
+-python38
+-python2.7
+-python3.5
+-python3.6
+-python3.7
+-python3.8
 -pypy
 
+# Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
+-texlive-latex
+
 %end

fedora-python-classroom-gnome-common.ks

@@ -7,7 +7,6 @@
 %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
+%include fedora-repo-not-rawhide.ks

fedora-scientific-common.ks

@@ -4,9 +4,9 @@
 @engineering-and-scientific
 
 # scilab
-scilab
-scilab-devel
-scilab-doc
+## scilab
+## scilab-devel
+## scilab-doc
 
 # Remove sagemath explicitly?
 -sagemath
@@ -28,14 +28,6 @@ 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
@@ -51,8 +43,6 @@ python3-networkx
 python3-pandas
 
 # matplotlib backends
-python-matplotlib-qt4
-python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-tk
 
@@ -66,16 +56,20 @@ gcc-gfortran
 # GUI for R
 rkward
 
-# GUI for Octave
-qtoctave
-
 # julia
 julia
 julia-doc
+julia-devel
 
 # IDEs for the IDE folks
 @eclipse
-spyder
+
+# Workaround for https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+
+python3-spyder
+python3-spyder-kernels
+
 
 #writing & publishing
 emacs
@@ -96,9 +90,8 @@ openmpi
 openmpi-devel
 valgrind-openmpi
 libgomp
-python-pp
-mpi4py-openmpi
 python3-mpi4py-openmpi
+python3-mpi4py-mpich
 
 #Version control- a GUI for each as well
 
@@ -120,7 +113,6 @@ libotf
 #root
 root
 root-gui-fitpanel
-root-python
 
 #Multiple jobs/clustering system
 # torque
@@ -136,8 +128,8 @@ dia
 inkscape
 xzgv
 gimp
-ggobi
-ggobi-devel
+## ggobi
+## ggobi-devel
 #g3data
 #Mayavi
 

fedora-soas-common.ks

@@ -9,6 +9,13 @@
 firewall --enabled --service=mdns,presence
 
 %packages
+
+# == Core Sugar Platform ==
+fedora-release-soas
+@sugar-desktop
+
+# explicitly remove a bunch of extra stuff
+-openbox
 -@fonts
 -@dial-up
 -@multimedia
@@ -30,7 +37,12 @@ firewall --enabled --service=mdns,presence
 -abrt-cli
 -ibus*
 -hyperv-daemons
--webkit2gtk3-plugin-process-gtk2
+-sane-backends
+-sane-backends-drivers-scanners
+-chkconfig
+-dhcp-client
+-gcc-gdb-plugin
+-gcc
 
 # Add some extra fonts
 dejavu-sans-fonts
@@ -40,38 +52,12 @@ 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
@@ -83,63 +69,24 @@ 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
-/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
 Sugar on a Stick
 EOF
 cat /etc/fedora-release >> /boot/olpc_build
 
-# Add our activities to the favorites
-cat > /usr/share/sugar/data/activities.defaults << EOF
-org.laptop.WebActivity
-org.laptop.HelpActivity
-org.laptop.Chat
-org.laptop.sugar.ReadActivity
-org.laptop.sugar.GetBooksActivity
-org.laptop.AbiWordActivity
-org.laptop.TurtleArtActivity
-org.laptop.Calculate
-org.laptop.Clock
-org.laptop.ImageViewerActivity
-org.laptop.Memorize
-org.laptop.physics
-org.laptop.Pippy
-org.laptop.RecordActivity
-org.laptop.Oficina
-org.laptop.StopWatchActivity
-org.laptop.community.Finance
-org.laptop.community.TypingTurtle
-org.laptop.sugar.Jukebox
-org.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
+# Rebuild initrd for Sugar boot screen
+KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
+/usr/sbin/plymouth-set-default-theme sugar
+dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+
+# Note that running rpm recreates the rpm db files which aren't needed or wanted
+rm -f /var/lib/rpm/__db*
 
 cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/sugar
@@ -163,6 +110,6 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end

fedora-workstation-common.ks

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

fedora-xfce-common.ks

@@ -12,6 +12,7 @@
 
 %packages
 
+fedora-release-xfce
 @networkmanager-submodules
 @xfce-desktop
 @xfce-apps
@@ -19,16 +20,12 @@
 @xfce-media
 @xfce-office
 
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
 # 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
-# Better more popular browser
-#firefox
 system-config-printer
 
 # save some space
@@ -38,6 +35,5 @@ system-config-printer
 -desktop-backgrounds-basic
 -aspell-*                   # dictionaries are big
 -xfce4-sensors-plugin
--foomatic-db-ppds
 
 %end

l10n/fedora-live-workstation-de_CH.ks

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

l10n/fedora-live-workstation-de_DE.ks

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

l10n/fedora-live-workstation-fr_FR.ks

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

l10n/fedora-live-workstation-ja_JP.ks

@@ -0,0 +1,40 @@
+# fedora-live-workstation-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the Gnome Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-workstation.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+langpacks-ja
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+# ibus stuff
+ibus-kkc
+imsettings
+%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
+
+gsettings set org.gnome.desktop.input-sources sources "[('ibus', 'kkc'), ('xkb', 'jp')]"
+
+%end

l10n/fedora-live-workstation-nl_NL.ks

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

l10n/fedora-live-workstation-pt_BR.ks

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

l10n/fedora-live-workstation-pt_PT.ks

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

l10n/fedora-live-workstation-ru_RU.ks

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

l10n/fedora-livecd-cinnamon-de_DE.ks

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

l10n/fedora-livecd-cinnamon-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-@japanese-support
+langpacks-ja
 # 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
-@german-support
+langpacks-de
 # exclude input methods
 -m17n*
 -scim*

l10n/fedora-livecd-kde-de_DE.ks

@@ -10,7 +10,7 @@ keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-@german-support
+langpacks-de
 
 # 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
-@french-support
+langpacks-fr
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-kde-ja_JP.ks

@@ -0,0 +1,40 @@
+# fedora-livecd-kde-ja_JP.ks
+#
+# Description:
+# - Japanese Fedora Live Spin with the KDE Desktop Environment
+#
+# Maintainer(s):
+# - Shintaro Fujiwara <shintaro.fujiwara@miraclelinux.com>
+
+%include ../fedora-live-kde.ks
+
+lang ja_JP.UTF-8
+keyboard jp
+timezone Asia/Tokyo
+
+%packages
+langpacks-ja
+# exclude input methods except ibus:
+-m17n*
+-scim*
+-iok
+# ibus-stuff 
+fcitx-qt5
+ibus-kkc
+ibus-mozc
+ibus-qt
+kcm-fcitx
+%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-livecd-kde-nl_NL.ks

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

l10n/fedora-livecd-kde-pt_PT.ks

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

l10n/fedora-livecd-kde-ru_RU.ks

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

l10n/fedora-livecd-lxde-de_CH.ks

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

l10n/fedora-livecd-lxde-de_DE.ks

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

l10n/fedora-livecd-lxde-fr_FR.ks

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

l10n/fedora-livecd-lxde-ja_JP.ks

@@ -13,11 +13,10 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-@japanese-support
-# exclude input methods:
+langpacks-ja
+# exclude input methods except ibus:
 -m17n*
 -scim*
--ibus*
 -iok
 # Better more popular browser
 firefox

l10n/fedora-livecd-lxde-ru_RU.ks

@@ -13,7 +13,7 @@ keyboard ru
 timezone Europe/Moscow
 
 %packages
-@russian-support
+langpacks-ru
 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-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang de_DE
 keyboard sg-latin1-nodeadkeys
 timezone Europe/Zurich
 
 %packages
-@german-support
+langpacks-de
 # 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-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys
 timezone Europe/Berlin
 
 %packages
-@german-support
+langpacks-de
 # 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-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang fr_FR.UTF-8
 keyboard fr-latin9
 timezone Europe/Paris
 
 %packages
-@french-support
+langpacks-fr
 # exclude input methods:
 -m17n*
 -scim*

l10n/fedora-livecd-xfce-ja_JP.ks

@@ -13,7 +13,7 @@ keyboard jp
 timezone Asia/Tokyo
 
 %packages
-@japanese-support
+langpacks-ja
 # 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-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang nl_NL
 keyboard us
 timezone Europe/Amsterdam
 
 %packages
-@dutch-support
+langpacks-nl
 # 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-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang pt_PT.UTF-8
 keyboard pt-latin1
 timezone Europe/Lisbon
 
 %packages
-@portuguese-support
+langpacks-pt
 # 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-livecd-xfce.ks
+%include ../fedora-live-xfce.ks
 
 lang ru_RU.UTF-8
 keyboard ru
 timezone Europe/Moscow
 
 %packages
-@russian-support
+langpacks-ru
 hunspell-ru
 
 # exclude input methods

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

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

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

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

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

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

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

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

l10n/fedora-livedvd-games-de_CH.ks

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

l10n/fedora-livedvd-games-de_DE.ks

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