Mate: use earlyoom instead of systemd-oomd-defaults

Fixing https://pagure.io/releng/failed-composes/issue/2567#comment-737735

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

fedora-cinnamon-common.ks

@@ -18,6 +18,6 @@ parole
 rhythmbox
 
 # extra backgrounds
-f36-backgrounds-extras-gnome
+f34-backgrounds-extras-gnome
 
 %end

fedora-cloud-base-gcp.ks

@@ -9,16 +9,9 @@
 # Don't show bootloader as it's impossible for the user to get to it in time
 # So we might as well not waste the 1 second on each boot.
 # https://cloud.google.com/compute/docs/import/import-existing-image
-bootloader --timeout=0 --location=mbr --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
+bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
-
-# redefine `services` here to drop cloud-init systemd unit enablements from
-# fedora-cloud-base.ks since we don't use them.
-services --enabled=sshd
 
 %packages
-# GCP provides its own guest environment.
-google-compute-engine-guest-configs
--cloud-init
 # Fedora Cloud Base includes the qemu guest agent. GCP prefers
 # that it not be installed  https://pagure.io/cloud-sig/issue/319
 -qemu-guest-agent

fedora-cloud-base-vagrant.ks

@@ -19,7 +19,7 @@ rootpw vagrant
 # even on VirtualBox virt, we get a primary network device with "eth0" as the name
 # This simplifies things and allows a single disk image for both supported Vagrant
 # platforms (virtualbox and kvm)
-bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
 # The default koji Vagrantfile configuration uses rsync to sync files between

fedora-cloud-base.ks

@@ -32,20 +32,13 @@ rootpw --lock --iscrypted locked
 firewall --disabled
 
 # We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
-bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
 
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
-# Configure for gpt with bios+uefi
+zerombr
-clearpart --all --initlabel --disklabel=gpt
+clearpart --all
-part prepboot  --size=4    --fstype=prepboot
+autopart --noboot --nohome --noswap --nolvm
-part biosboot  --size=1    --fstype=biosboot
-part /boot/efi --size=100  --fstype=efi
-part /boot     --size=1000  --fstype=ext4 --label=boot
-part btrfs.007 --size=2000 --fstype=btrfs --grow
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs /     --subvol --name=root LABEL=fedora
 
 %include fedora-repo.ks
 
@@ -83,6 +76,9 @@ qemu-guest-agent
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld
 
+# noswap on Cloud for now
+-zram-generator-defaults
+
 # Don't include the geolite2 databases, which end up with 66MiB
 # in /usr/share/GeoIP
 -geolite2-country
@@ -94,15 +90,6 @@ qemu-guest-agent
 ##### begin kickstart post ###########################################
 %post --erroronfail
 
-if [ "$(arch)" = "x86_64" ]; then
-# Set up legacy BIOS boot if we booted from UEFI
-grub2-install --target=i386-pc /dev/vda
-fi
-
-# Blivet sets pmbr_boot flag erroneously and we need to purge it
-# otherwise it'll fail to boot
-parted /dev/vda disk_set pmbr_boot off
-
 # linux-firmware is installed by default and is quite large. As of mid 2020:
 #   Total download size: 97 M
 #   Installed size: 268 M
@@ -123,27 +110,16 @@ basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 echo "Zeroing out empty space."
-# Create zeros file with nodatacow and no compression
-touch /var/tmp/zeros
-chattr +C /var/tmp/zeros
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-echo "(Don't worry -- that out-of-space error was expected.)"
-# Force sync to disk (Cf. https://pagure.io/cloud-sig/issue/340#comment-743430)
-btrfs filesystem sync /
 rm -f /var/tmp/zeros
-btrfs filesystem sync /
+echo "(Don't worry -- that out-of-space error was expected.)"
 
 # When we build the image a networking config file gets left behind.
 # Let's clean it up.
 echo "Cleanup leftover networking configuration"
 rm -f /etc/NetworkManager/system-connections/*.nmconnection
 
-# Truncate the /etc/resolv.conf left over from NetworkManager during the
-# kickstart. This causes delays in boot with cloud-init because the
-# 192.168.122.1 DNS server cannot be reached.
-truncate -s 0 /etc/resolv.conf
-
 # Clear machine-id on pre generated images
 truncate -s 0 /etc/machine-id
 

fedora-comp-neuro-common.ks

@@ -11,19 +11,36 @@ fedora-release-compneuro
 
 #Computational neuroscience packages
 arbor
+auryn-mpich
+auryn-openmpi
+bionetgen
+calcium-calculator
+COPASI
+qalculate
+getdp
 genesis-simulator
+gnuplot
 moose
 nest
 neuron
 neuron-devel
+octave
+paraview
 python3
 python3-brian2
 python3-ipython
-python3-lfpy
 python3-nest
 python3-netpyne
 python3-neuron
+python3-niapy
+python3-libNeuroML
+python3-neo
+python3-PyLEMS
 python3-pynn
 python3-steps
+smoldyn
+
+# Orphaned
+# python3-nineml
 
 %end

fedora-container-base.ks

@@ -11,6 +11,7 @@ tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+sssd-client
 sudo
 -glibc-langpack-en
 -langpacks-en
@@ -37,7 +38,7 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
-rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
+rm /run/nologin # https://pagure.io/atomic-wg/issue/316
 
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*

fedora-container-common.ks

@@ -18,8 +18,7 @@
 
 text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
 bootloader --disabled
-timezone --isUtc Etc/UTC
+timezone --isUtc --nontp Etc/UTC
-timesource --ntp-disable
 rootpw --lock --iscrypted locked
 keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -36,7 +35,9 @@ bash
 coreutils
 glibc-minimal-langpack
 rpm
-util-linux-core
+shadow-utils
+sssd-client
+util-linux
 -kernel
 -dosfstools
 -e2fsprogs
@@ -48,10 +49,6 @@ util-linux-core
 -trousers
 -xkeyboard-config
 -grubby
--langpacks-en_GB
-# https://bugzilla.redhat.com/show_bug.cgi?id=1951111
--util-linux
--sssd-client
 
 %end
 
@@ -68,13 +65,7 @@ echo 'LANG="C.UTF-8"' >  /etc/locale.conf
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1400682
 echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{?fedora}')
+releasever=$(rpm --eval '%{fedora}')
-
-# When building ELN containers, we don't have the %{fedora} macro
-if [ -z $releasever ]; then
-  releasever=eln
-fi
-
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
 
 echo "# fstab intentionally empty for containers" > /etc/fstab
@@ -83,6 +74,4 @@ echo "# fstab intentionally empty for containers" > /etc/fstab
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-echo "# resolv placeholder" > /etc/resolv.conf
-chmod 644 /etc/resolv.conf
 %end

fedora-design-suite-common.ks

@@ -10,10 +10,10 @@ deja-dup
 deja-dup-nautilus
 
 # Add extra gnome applications
-#gnome-books
+gnome-books
 gnome-calendar
 gnome-photos
-gnome-pomodoro
+gnome-shell-extension-pomodoro
 gnome-todo
 
 # Add cosmetic for terminal
@@ -27,5 +27,6 @@ powerline-fonts
 # temporarily removing conflicting application
 -mypaint
 -sparkleshare
+-blender-luxcorerender
 
 %end

fedora-disk-base.ks

@@ -65,7 +65,6 @@ 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
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-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
@@ -82,7 +81,7 @@ rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
 rm -f /var/lib/systemd/random-seed
 
 # The enp1s0 interface is a left over from the imagefactory install, clean this up
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
+rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0
 
 dnf -y remove dracut-config-generic
 
@@ -93,12 +92,4 @@ touch /etc/machine-id
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
 
-# Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
-# when you are using fedora via serial console as you do not get any output post grub
-# linux does a good job of knowing what consoles need to be enabled.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2022757
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
-sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
-fi
-
 %end

fedora-eln-container-base.ks

@@ -1,28 +1,77 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
 # This base is a standard Fedora-ELN image with python3 and dnf
 
-%include fedora-container-common.ks
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+bootloader --disabled
+timezone --isUtc --nontp Etc/UTC
+rootpw --lock --iscrypted locked
+keyboard us
+network --bootproto=dhcp --device=link --activate --onboot=on
+reboot
+
+# boot partitions are irrelevant as the final docker image is a tarball
+zerombr
+clearpart --all
+autopart --noboot --nohome --noswap --nolvm
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
--fedora-release-container
 fedora-release-eln
+dnf-plugins-core
 fedora-repos-eln
+bash
+coreutils
+glibc-minimal-langpack
+rpm
+shadow-utils
+sssd-client
+util-linux
+-kernel
+-dosfstools
+-e2fsprogs
+-fuse-libs
+-gnupg2-smime
+-libss # used by e2fsprogs
+-pinentry
+-shared-mime-info
+-trousers
+-xkeyboard-config
+-grubby
+
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
 dnf
-dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
+yum  # DNF compatibility with yum
+sssd-client
 sudo
 -glibc-langpack-en
+-cracklib-dicts
 -langpacks-en
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
 set -eux
 
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-33-primary \
+# Set install langs macro so that new rpms that get installed will
-             /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-primary \
+# only install langs that we limit it to.
-             /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-35-primary
+LANG="en_US"
+echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
+echo 'LANG="C.UTF-8"' >  /etc/locale.conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
+echo "Import RPM GPG key"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-33-primary /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-primary
+
+# Disable conflicting repositories.
+dnf config-manager --disable "*rawhide*" "*cisco*"
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
 
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
@@ -44,7 +93,6 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf
 #   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
 #
 umount /run
-rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
 
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*

fedora-eln-guest.ks

@@ -9,6 +9,7 @@ keyboard us
 timezone --utc America/New_York
 # add console and reorder in %post
 bootloader --timeout=1 --location=mbr --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0"
+auth --enableshadow --passalgo=sha512
 selinux --enforcing
 firewall --enabled --service=ssh
 network --bootproto=dhcp --device=link --activate --onboot=on
@@ -122,11 +123,12 @@ subscription-manager-cockpit
 -langpacks-en
 
 # We are building Fedora-ELN
-fedora-release-eln
+fedora-release
-fedora-repos-eln
+fedora-repos
 
 # Add rng-tools as source of entropy
-rng-tools
+# TODO: Not available in Fedora-ELN yet.
+# rng-tools
 
 %end
 
@@ -160,11 +162,18 @@ echo -n "Getty fixes"
 sed -i '/^#NAutoVTs=.*/ a\
 NAutoVTs=0' /etc/systemd/logind.conf
 
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
 # For cloud images, 'eth0' _is_ the predictable device name, since
 # we don't want to be tied to specific virtual (!) hardware
 rm -f /etc/udev/rules.d/70*
 ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
+rm -f /etc/sysconfig/network-scripts/ifcfg-*
 # simple eth0 config, again not hard-coded to the build hardware
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"

fedora-i3-common.ks

@@ -12,6 +12,7 @@
 
 %packages
 @^i3-desktop-environment
+brightlight
 feh
 dex-autostart
 thunar

fedora-iot.ks

@@ -11,7 +11,7 @@ rootpw --lock --iscrypted locked
 bootloader --timeout=1 --append="modprobe.blacklist=vc4"
 
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=NetworkManager,sshd
+services --enabled=NetworkManager,sshd,rngd
 
 zerombr
 clearpart --all --initlabel --disklabel=msdos
@@ -35,7 +35,6 @@ 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
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-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
@@ -88,7 +87,8 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
 rm -f /var/tmp/zeros
 echo "(Don't worry -- that out-of-space error was expected.)"
 
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
+# For trac ticket https://pagure.io/atomic-wg/issue/128
+rm -f /etc/sysconfig/network-scripts/ifcfg-*
 
 # Anaconda is writing an /etc/resolv.conf from the install environment.
 # The system should start out with an empty file, otherwise cloud-init

fedora-kde-common.ks

@@ -7,9 +7,6 @@
 @kde-apps
 @kde-media
 @libreoffice
-# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
-libreoffice-draw
-libreoffice-math
 
 fedora-release-kde
 
@@ -27,6 +24,7 @@ mariadb-connector-c
 mariadb-server
 
 # minimal localization support - allows installing the kde-l10n-* packages
+system-config-language
 kde-l10n
 
 # unwanted packages from @kde-desktop

fedora-kde-minimization.ks

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

fedora-live-astronomy_kde.ks

@@ -18,7 +18,7 @@
 %include fedora-live-minimization.ks
 
 # The recommended part size for DVDs is too close to use for the astronomy spin
-part / --size 16000
+part / --size 14500
 
 %packages
 
@@ -37,20 +37,24 @@ fpack
 psfex
 scamp
 sextractor
-#siril
+siril
 skyviewer
 swarp
 wcstools
 
 # Observatory: KStars + INDI drivers
-indi-3rdparty-drivers
+indi-aagcloudwatcher
+indi-apogee
+indi-eqmod
+indi-gphoto
+indi-sx
 indistarter
 kstars
 
 # misc. astronomy
 #celestia
 stellarium
-#virtualplanet
+virtualplanet
 
 # Some astro environment stuff
 astronomy-menus
@@ -78,6 +82,7 @@ astropy-tools
 ginga
 python3-astropy
 python3-astroML
+python3-astroML-addons
 python3-astroquery
 python3-astroscrappy
 python3-APLpy
@@ -112,8 +117,7 @@ gimp
 kst
 kst-docs
 kst-fits
-# LabPlot currently not installable due to #2044284
+LabPlot
-#LabPlot
 
 #Misc. Utils
 ImageMagick

fedora-live-base.ks

@@ -30,6 +30,12 @@ kernel
 kernel-modules
 kernel-modules-extra
 
+# This was added a while ago, I think it falls into the category of
+# "Diagnosis/recovery tool useful from a Live OS image".  Leaving this untouched
+# for now.
+#memtest86+
+@x86-baremetal-tools # memtest86+ is included
+
 # The point of a live image is to install
 anaconda
 anaconda-install-env-deps
@@ -45,6 +51,7 @@ aajohan-comfortaa-fonts
 
 # Without this, initramfs generation during live image creation fails: #1242586
 dracut-live
+# syslinux is in @x86-baremetal-tools
 
 # anaconda needs the locales available to run for different locales
 glibc-all-langpacks

fedora-live-games.ks

@@ -1,12 +1,9 @@
 # fedora-live-games.ks
 #
-# Maintainers:
+# Maintainer:
 # - Darryl T. Agostinelli <dagostinelli@gmail.com>
 #   https://fedoraproject.org/wiki/User:Dagostinelli
 #
-# - Richard Anaya <richard.anaya@gmail.com>
-#   https://fedoraproject.org/wiki/User:Richardanaya
-#
 # Former Maintainers:
 # - Bruno Wolff III <bruno@wolff.to>
 #   https://fedoraproject.org/wiki/User:Bruno

fedora-live-jam_kde.ks

@@ -7,7 +7,7 @@
 # Web: https://fedoraproject.org/wiki/Fedora_jam
 # Web: insert spinspacke when created
 
-# Maintainer: JT Pennington (q5sys) <jt@obs-sec.com>
+# Maintainer: Erich Eickmeyer <erich@ericheickmeyer.com>
 
 %include fedora-live-kde.ks
 

fedora-live-kde-base.ks

@@ -67,10 +67,6 @@ mkdir -p /home/liveuser/.config/autostart
 cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/
 echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop
 
-# Disable plasma-welcome for now
-# Cf. https://bugs.kde.org/show_bug.cgi?id=466282
-rm -f /etc/xdg/autostart/org.kde.plasma-welcome.desktop
-
 # Disable baloo
 cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
 [Basic Settings]
@@ -89,15 +85,6 @@ cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
 alreadyMigrated=true
 KWALLET_EOL
 
-# Disable automount of 'known' devices
-# https://bugzilla.redhat.com/show_bug.cgi?id=2073708
-cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF
-[General]
-AutomountEnabled=false
-AutomountOnLogin=false
-AutomountOnPlugin=false
-AUTOMOUNTER_EOF
-
 # make sure to set the right permissions and selinux contexts
 chown -R liveuser:liveuser /home/liveuser/
 restorecon -R /home/liveuser/

fedora-live-kde.ks

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

fedora-live-robotics.ks

@@ -1,6 +1,5 @@
-# Maintained by x3mboy and the Fedora Robotics SIG:
+# Maintained by the Fedora Robotics SIG:
-# https://fedoraproject.org/wiki/SIGs/Robotics
+# http://fedoraproject.org/wiki/SIGs/Robotics
-# mailto:x3mboy@fedoraproject.org
 # mailto:robotics@lists.fedoraproject.org
 
 %include fedora-live-base.ks
@@ -108,7 +107,6 @@ FOE
 # disable updates plugin
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
-allow-updates=false
 download-updates=false
 FOE
 

fedora-live-security.ks

@@ -6,7 +6,6 @@
 # Maintainers:
 #   Fabian Affolter <fab [AT] fedoraproject <dot> org>
 #   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
-#   JT Pennington <jt [AT] fedoraproject <dot> org>
 # Acknowledgements:
 #   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
 #   many thanks, especially to Christoph Wickert!

fedora-live-workstation.ks

@@ -10,7 +10,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 7750
+part / --size 7680
 
 %post
 
@@ -20,12 +20,11 @@ cat >> /etc/rc.d/init.d/livesys << EOF
 # disable gnome-software automatically downloading updates
 cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
 [org.gnome.software]
-allow-updates=false
 download-updates=false
 FOE
 
 # don't autostart gnome-software session service
-rm -f /etc/xdg/autostart/org.gnome.Software.desktop
+rm -f /etc/xdg/autostart/gnome-software-service.desktop
 
 # disable the gnome-software shell search provider
 cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE

fedora-modular-arm-server.ks

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

fedora-modular-disk-minimal.ks

@@ -62,7 +62,6 @@ 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
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-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

fedora-python-classroom-common.ks

@@ -27,8 +27,6 @@ wget
 -python3.6
 -python3.7
 -python3.8
--python3.9
--python3.10
 -pypy
 
 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450

fedora-python-classroom-gnome-common.ks

@@ -35,9 +35,6 @@ python3-pillow-tk
 # This is no longer workstation
 -@workstation-product
 
-# But we want to keep the Fedora desktop backgrounds
-desktop-backgrounds-gnome
-
 # Add a web browser
 @firefox
 
@@ -48,7 +45,7 @@ desktop-backgrounds-gnome
 
 # Drop the Java plugin and Java
 -icedtea-web
--*openjdk*
+-java*
 
 # No printing
 -@printing

fedora-repo.ks

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

fedora-scientific-common.ks

@@ -43,13 +43,9 @@ python3-networkx
 python3-pandas
 
 # matplotlib backends
-python3-matplotlib-qt5
+python3-matplotlib-qt4
 python3-matplotlib-tk
 
-# Include Java development tools
-@java-development
-apache-commons-math
-
 #fortran compiler
 gcc-gfortran
 
@@ -64,13 +60,10 @@ julia-devel
 python3-spyder
 python3-spyder-kernels
 
-
 #writing & publishing
 emacs
 emacs-color-theme
 vim
-scribus
-#scite
 lyx
 kile
 
@@ -118,10 +111,8 @@ root-gui-fitpanel
 # python-pbs
 
 #Drawing, Picture viewing tools, Visualization tools
-dia
 inkscape
 xzgv
-gimp
 ## ggobi
 ## ggobi-devel
 #g3data

fedora-server-vm-full.ks

@@ -1,194 +0,0 @@
-# fedora-server-vm-full.ks (rel. 1.01)
-# Kickstart file to build a Fedora Server Edition VM disk image.
-# The image aims to resemble as close as technically possible the
-# full features of a Fedora Server Edition in a virtual machine.
-#
-# The image uses GPT partition type as of default in Fedora 37
-#
-# At first boot it opens a test based basic configuration screen.
-#
-# This kickstart file is designed to be used with ImageFactory (in Koji).
-#
-# To build the image locally, you need to install ImageFactory and
-# various additional helpers and configuration files.
-# See Fedora Server Edition user documentation tutorial.
-
-# Use text mode install
-text
-
-# Keyboard layouts
-keyboard 'us'
-
-# System language
-lang en_US.UTF-8
-
-# System timezone
-# set time zone to GMT (Etcetera/UTC)
-timezone Etc/UTC --utc
-
-
-# Root password
-rootpw --iscrypted --lock locked
-
-# SELinux configuration
-selinux --enforcing
-
-
-# System bootloader configuration
-bootloader --location=mbr --timeout=1 --append="console=tty1 console=ttyS0,115200n8"
-
-# Network information
-network  --bootproto=dhcp --device=link --activate --onboot=on
-
-# Firewall configuration
-firewall --enabled --service=mdns
-
-
-# System services
-# message: error enabling initial-setup, initial-setup does not exist
-services --enabled="sshd,NetworkManager,chronyd,initial-setup"
-
-# Run the Setup Agent on first boot
-firstboot --reconfig
-
-# Partition Information. Use GPT by default (since Fedora 37)
-# Resemble the Partitioning used for Fedora Server Install media
-clearpart --all --initlabel --disklabel=gpt
-reqpart --add-boot
-part pv.007     --size=4000  --grow
-volgroup  sysvg  pv.007
-logvol / --vgname=sysvg --size=4000 --grow --maxsize=16000 --fstype=xfs --name=root --label=sysroot
-
-
-# Include URLs for network installation dynamically, dependent from Fedora release
-# and imagefactory runtime environment
-%include fedora-repo.ks
-
-# Shutdown after installation
-shutdown
-
-
-
-##### begin package list #############################################
-%packages --inst-langs=en
-
-@server-product
-@core
-@headless-management
-@standard
-@networkmanager-submodules
-##@container-management
-@domain-client
-@guest-agents
-
-# All arm-tools packages install on aarch64/armhfp only
-# TODO: on a x86_64 devel environment are @arm-tools not available
-# and cause a build error.
-# @arm-tools
-
-# Standard Fedora Package Groups
-## dracut-config-generic  ## included in =core=
-glibc-all-langpacks
-initial-setup
-kernel-core
--dracut-config-rescue
--generic-release*
--initial-setup-gui
--kernel
--linux-firmware
--plymouth
-# pulled in by @standard
--smartmontools
--smartmontools-selinux
-
-%end
-##### end package list ###############################################
-
-
-##### begin kickstart post script ####################################
-%post --erroronfail  --log=/root/anaconda-post-1.log
-
-# Find the architecture we are on
-arch=$(uname -m)
-
-# Import RPM GPG key, during installation saved in /etc/pki
-echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{fedora}')
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-# See the systemd-random-seed.service man page that says:
-#   " It is recommended to remove the random seed from OS images intended
-#     for replication on multiple systems"
-# The newly installed instance should make it's own
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/systemd/random-seed
-
-# When we build the image a networking config file gets left behind.
-# Let's clean it up.
-echo "Cleanup leftover networking configuration"
-rm -f /etc/NetworkManager/system-connections/*.nmconnection
-
-# Truncate the /etc/resolv.conf left over from NetworkManager during the
-# kickstart because the DNS server is environment specific.
-truncate -s 0 /etc/resolv.conf
-
-echo "Cleaning repodata to save space."
-dnf clean all
-
-# linux-firmware is installed by default and is quite large. As of mid 2020:
-#   Total download size: 97 M
-#   Installed size: 268 M
-# Not needed in virtual environment.
-echo "Removing linux-firmware package."
-rpm -e linux-firmware
-
-# Will ever anybody see this?
-echo "Packages within this disk image"
-rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
-
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
-
-# Do we need a serial terminal with a VM?
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
- # Anaconda adds console=tty0 to the grub boot line on all images. this is problematic
- # when you are using fedora via serial console as you do not get any output post grub
- # linux does a good job of knowing what consoles need to be enabled.
- # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
- sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
-fi
-
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-%end
-##### end kickstart post script #####################################
-
-
-##### begin custom post script (after base) #########################
-%post
-
-echo "Zeroing out empty space."
-# Create zeros file with nodatacow and no compression
-touch /var/tmp/zeros
-chattr +C /var/tmp/zeros
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-echo "(Don't worry -- that out-of-space error was expected.)"
-# Force sync to disk
-sync /
-rm -f /var/tmp/zeros
-sync /
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-%end
-##### end custom post script ########################################

fedora-soas-common.ks

@@ -78,8 +78,7 @@ cat /etc/fedora-release >> /boot/olpc_build
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
-sed -i -r 's/(omit_dracutmodules\+\=.*) plymouth (.*)/\1 \2/' /etc/dracut.conf.d/99-liveos.conf
+dracut -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-dracut --force-add plymouth -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
@@ -110,14 +109,3 @@ EOF
 /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
 %end
-
-%post --nochroot
-
-for n in initramfs initrd; do
-    for img in "$LIVE_ROOT/images/pxeboot/$n"* ; do
-        [ -e "$img" ] && cp -a "$INSTALL_ROOT"/boot/initramfs-*.img "$img"
-    done
-done
-
-%end
-

maintainers.toml

@@ -28,19 +28,19 @@ fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
 
 [spins.soas.x86_64]
-fas = [ "chimosky", "aperezbios" ]
+fas = [ "chimosky", "aperezbios", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
 [spins.soas.armhfp]
-fas = [ "chimosky", "aperezbios", ]
+fas = [ "chimosky", "aperezbios", "pbrobinson" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
 
 [labs.astronomy_kde.x86_64]
 fas = [ "lupinix" ]
 maintainers = [ "Christian Dersch" ]
 
 [labs.security.x86_64]
-fas = [ "fab", "jsimon", "q5sys"]
+fas = [ "fab", "jsimon" ]
-maintainers = [ "Fabian Affolter", "Joerg Simon", "JT Pennington" ]
+maintainers = [ "Fabian Affolter", "Joerg Simon" ]
 
 [labs.comp_neuro.x86_64]
 fas = [ "bt0dotninja", "dan1mal", "ankursinha", "neuro-sig" ]
@@ -51,12 +51,12 @@ fas = [ "luya" ]
 maintainers = [ "Luya Tshimbalanga" ]
 
 [labs.games.x86_64]
-fas = [ "dagostinelli", "richardanaya" ]
+fas = [ "dagostinelli" ]
-maintainers = [ "Darryl T. Agostinelli", "Richard Anaya" ]
+maintainers = [ "Darryl T. Agostinelli" ]
 
 [labs.jam_kde.x86_64]
-fas = [ "q5sys" ]
+fas = [ "eeickmeyer" ]
-maintainers = [ "JT Pennington" ]
+maintainers = [ "Erich Eickmeyer" ]
 
 [labs.python_classroom.x86_64]
 fas = [ "churchyard", "python-sig" ]
@@ -71,13 +71,9 @@ fas = [ "scitech" ]
 maintainers = [ "SciTech SIG" ]
 
 [labs.robotics.x86_64]
-fas = [ "x3mboy", "robotics-sig" ]
+fas = [ "rmattes", "robotics-sig" ]
-maintainers = [ "Eduard Lucena", "Robotics SIG" ]
+maintainers = [ "Rich Mattes", "Robotics SIG" ]
 
 [spins.i3.x86_64]
 fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ]
 maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ]
-
-[eln]
-fas = [ "sgallagh", "tdawson", "asamalik" ]
-maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik" ]