Mate: use earlyoom instead of systemd-oomd-defaults

During the kickstart of the cloud image, NetworkManager writes an
/etc/resolv.conf that contains `nameserver 192.168.122.1`. This causes
boot delays with cloud-init since it does some early boot DNS
redirection tests before talking to the cloud's metadata service. On
some clouds/architectures, this delay is 15 seconds or more.

Truncate the /etc/resolv.conf so it can be replaced properly by
NetworkManager and cloud-init on the first boot.

Signed-off-by: Major Hayden <major@redhat.com>

fedora-cinnamon-common.ks

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

fedora-cloud-base.ks

@@ -41,7 +41,7 @@ clearpart --all --initlabel --disklabel=gpt
 part prepboot  --size=4    --fstype=prepboot
 part biosboot  --size=1    --fstype=biosboot
 part /boot/efi --size=100  --fstype=efi
-part /boot     --size=1000  --fstype=ext4 --label=boot
+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

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

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

@@ -36,7 +36,7 @@ bash
 coreutils
 glibc-minimal-langpack
 rpm
-util-linux-core
+util-linux
 -kernel
 -dosfstools
 -e2fsprogs
@@ -68,13 +68,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}')
-
-# When building ELN containers, we don't have the %{fedora} macro
-if [ -z $releasever ]; then
-  releasever=eln
-fi
-
+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

@@ -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
@@ -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,17 +1,48 @@
 # 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
 -langpacks-en
@@ -20,9 +51,26 @@ sudo
 %post --erroronfail --log=/root/anaconda-post.log
 set -eux
 
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-33-primary \
-             /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-primary \
-             /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-35-primary
+# Set install langs macro so that new rpms that get installed will
+# only install langs that we limit it to.
+LANG="en_US"
+echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
+echo 'LANG="C.UTF-8"' >  /etc/locale.conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
+echo "Import RPM GPG key"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-33-primary /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-primary
+
+# Disable conflicting repositories.
+dnf config-manager --disable "*rawhide*" "*cisco*"
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
 
 # remove some extraneous files
 rm -rf /var/cache/dnf/*
@@ -44,7 +92,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-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

fedora-kde-common.ks

@@ -27,6 +27,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,13 +37,17 @@ 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
 
@@ -113,8 +117,7 @@ gimp
 kst
 kst-docs
 kst-fits
-# LabPlot currently not installable due to #2044284
-#LabPlot
+LabPlot
 
 #Misc. Utils
 ImageMagick

fedora-live-jam_kde.ks

@@ -58,6 +58,8 @@ thunderbird
 -non-mixer
 -non-session-manager
 -non-sequencer
+# until rhbz#1996449 is fixed
+-tuxguitar
 
 %end
 

fedora-live-kde-base.ks

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

@@ -107,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-workstation.ks

@@ -10,7 +10,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 7750
+part / --size 7680
 
 %post
 
@@ -20,7 +20,6 @@ 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
 

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

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 --force-add plymouth -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+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*
@@ -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

@@ -77,7 +77,3 @@ 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" ]