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
-f35-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=500  --fstype=ext4 --label=boot
-part btrfs.007 --size=2000 --fstype=btrfs --grow
-btrfs none --label=fedora btrfs.007
-btrfs /home --subvol --name=home LABEL=fedora
-btrfs /     --subvol --name=root LABEL=fedora
 
 %include fedora-repo.ks
 
@@ -83,14 +76,13 @@ qemu-guest-agent
 # No need for firewalld for now. We don't have a firewall on by default.
 -firewalld
 
+# noswap on Cloud for now
+-zram-generator-defaults
+
 # Don't include the geolite2 databases, which end up with 66MiB
 # in /usr/share/GeoIP
 -geolite2-country
 -geolite2-city
-
-# Include dependencies for cloud-init on Azure.
-gdisk
-openssl
 %end
 ##### end package list ###############################################
 
@@ -98,15 +90,6 @@ openssl
 ##### 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
@@ -127,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

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

fedora-design-suite-common.ks

@@ -13,7 +13,7 @@ deja-dup-nautilus
 gnome-books
 gnome-calendar
 gnome-photos
-gnome-pomodoro
+gnome-shell-extension-pomodoro
 gnome-todo
 
 # Add cosmetic for terminal

fedora-disk-base.ks

@@ -81,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
 

fedora-eln-container-base.ks

@@ -45,6 +45,7 @@ yum  # DNF compatibility with yum
 sssd-client
 sudo
 -glibc-langpack-en
+-cracklib-dicts
 -langpacks-en
 %end
 

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
@@ -161,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

@@ -19,7 +19,7 @@ autopart --nohome --noswap --type=plain
 
 # Equivalent of %include fedora-repo.ks
 # Pull from the ostree repo that was created during the compose
-ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/rawhide/${basearch}/iot
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
 
 reboot
 
@@ -44,14 +44,14 @@ fi
 
 # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
 # We want consumers of this image to track the two week releases.
-ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/rawhide/${arch}/iot"
+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/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
+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/rawhide/${arch}/iot" --delete
+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
@@ -87,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
 

fedora-live-astronomy_kde.ks

@@ -54,7 +54,7 @@ kstars
 # misc. astronomy
 #celestia
 stellarium
-#virtualplanet
+virtualplanet
 
 # Some astro environment stuff
 astronomy-menus

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-mate-common.ks

@@ -20,6 +20,12 @@ fusion-icon
 # blacklist applications which breaks mate-desktop
 -audacious
 
+# see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
+# and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
+# use earlyoom instead of systemd-oomd-defaults
+earlyoom
+-systemd-oomd-defaults
+
 # office
 @libreoffice
 

fedora-python-classroom-common.ks

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

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

@@ -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

maintainers.toml

@@ -28,11 +28,11 @@ 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" ]
@@ -55,8 +55,8 @@ fas = [ "dagostinelli" ]
 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" ]