Mate: use earlyoom instead of systemd-oomd-defaults

KDE size increase
Fixing https://pagure.io/releng/failed-composes/issue/2567#comment-737735 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2022-04-01 13:14:20 +02:00 · 2022-02-04 13:01:23 -08:00 · 2021-04-28 14:04:41 +01:00 · 2021-04-22 23:34:44 -07:00 · 2021-04-23 00:12:59 -04:00 · 2021-04-12 12:05:17 -04:00
54 changed files with 985 additions and 557 deletions
--- a/custom/qa-test-day.ks
+++ b/custom/qa-test-day.ks
@ -111,7 +111,7 @@ firefox

 # "EOF" is quoted so that variables are not expanded. Search for "here-document"
 # in man bash.
-cat >> /var/lib/livesys/livesys-session-extra << "EOF"
+cat >> /etc/rc.d/init.d/livesys << "EOF"

 # Create Test Day welcome screen
 # Note that shebang must be written this way, else it is considered as comment
--- a/fedora-budgie-common.ks
+++ b/fedora-budgie-common.ks
@ -1,23 +0,0 @@
-%packages
-fedora-release-budgie
-
-# Exclude unwanted groups that fedora-live-base.ks pulls in
-@dial-up
-@input-methods
-@standard
-
-# Install budgie environment
-@^budgie-desktop-environment
-
-# recommended apps
-@budgie-desktop-apps
-@libreoffice
-libreoffice-draw
-libreoffice-math
-thunderbird
-
-# Exclude unwanted packages from @anaconda-tools group
-gfs2-utils
-reiserfs-utils
-
-%end
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@ -14,9 +14,10 @@ fedora-release-cinnamon
@^cinnamon-desktop-environment

@libreoffice
+parole
 rhythmbox

 # extra backgrounds
-f36-backgrounds-extras-gnome
+f34-backgrounds-extras-gnome

 %end
--- a/fedora-cloud-base-azure.ks
+++ b/fedora-cloud-base-azure.ks
@ -1,24 +0,0 @@
-# This is a basic Fedora cloud spin designed to work with Azure.
-
-# Inherit from cloud base
-%include fedora-cloud-base.ks
-
-%packages
-# Fedora Cloud Base includes the qemu guest agent and it is not
-# required for Azure: https://pagure.io/cloud-sig/issue/319
-qemu-guest-agent
-WALinuxAgent
-%end
-
-%post --erroronfail
-cat > /etc/ssh/sshd_config.d/50-client-alive-interval.conf << EOF
-ClientAliveInterval 120
-EOF
-
-cat >> /etc/chrony.conf << EOF
-
-# Azure's virtual time source:
-# https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync#check-for-ptp-clock-source
-refclock PHC /dev/ptp_hyperv poll 3 dpoll -2 offset 0
-EOF
-%end
--- a/fedora-cloud-base-gcp.ks
+++ b/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"
-
-# redefine `services` here to drop cloud-init systemd unit enablements from
-# fedora-cloud-base.ks since we don't use them.
-services --enabled=sshd
+bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"

 %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
--- a/fedora-cloud-base-vagrant.ks
+++ b/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
--- a/fedora-cloud-base.ks
+++ b/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
-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 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
+zerombr
+clearpart --all
+autopart --noboot --nohome --noswap --nolvm

 %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

--- a/fedora-comp-neuro-common.ks
+++ b/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
--- a/fedora-container-base.ks
+++ b/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/*
--- a/fedora-container-common.ks
+++ b/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
-timesource --ntp-disable
+timezone --isUtc --nontp Etc/UTC
 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}')
-
-# 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
@ -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
--- a/fedora-design-suite-common.ks
+++ b/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
@ -22,10 +22,11 @@ powerline-fonts

 # removal of unneeded applications
 -gnome-boxes
-
+-eog

 # temporarily removing conflicting application
 -mypaint
 -sparkleshare
+-blender-luxcorerender

 %end
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@ -34,6 +34,8 @@ firstboot --reconfig
@hardware-support

 kernel
+# on 32bit arm make sure we only install one kernel
+-kernel-lpae
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
@ -57,9 +59,17 @@ glibc-all-langpacks

 # Find the architecture we are on
 arch=$(uname -m)
+
 # Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+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}')
@ -71,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

@ -82,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" ]]; then
-sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
-fi
-
 %end
--- a/fedora-disk-budgie.ks
+++ b/fedora-disk-budgie.ks
@ -1,5 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-budgie-common.ks
-
-autopart --type=btrfs --noswap
--- a/fedora-disk-lxqt.ks
+++ b/fedora-disk-lxqt.ks
@ -1,5 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-lxqt-common.ks
-
-autopart --type=btrfs --noswap
--- a/fedora-disk-phosh.ks
+++ b/fedora-disk-phosh.ks
@ -1,5 +0,0 @@
-%include fedora-disk-base.ks
-%include fedora-disk-xbase.ks
-%include fedora-phosh-common.ks
-
-autopart --type=btrfs --noswap
--- a/fedora-eln-container-base.ks
+++ b/fedora-eln-container-base.ks
@ -1,25 +1,78 @@
 # 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

+# 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/*
 rm -rf /tmp/*
@ -40,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/*
--- a/fedora-eln-guest.ks
+++ b/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
@ -116,12 +117,18 @@ subscription-manager-cockpit
 # Exclude all langpacks for now
 -langpacks-*

+# The langpacks-en package is pulled in by Anaconda and it seems filtering
+# it out using langpacks-* is not sufficient. It needs to be filtered
+# directly.
+-langpacks-en
+
 # We are building Fedora-ELN
-fedora-release-eln
-fedora-repos-eln
+fedora-release
+fedora-repos

 # Add rng-tools as source of entropy
-rng-tools
+# TODO: Not available in Fedora-ELN yet.
+# rng-tools

 %end

@ -155,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"
--- a/fedora-i3-common.ks
+++ b/fedora-i3-common.ks
@ -12,6 +12,7 @@

 %packages
@^i3-desktop-environment
+brightlight
 feh
 dex-autostart
 thunar
--- a/fedora-iot.ks
+++ b/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
@ -19,29 +19,39 @@ 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

 %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_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+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/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
@ -77,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
--- a/fedora-kde-common.ks
+++ b/fedora-kde-common.ks
@ -7,36 +7,54 @@
@kde-apps
@kde-media
@libreoffice
-# add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
-libreoffice-draw
-libreoffice-math

 fedora-release-kde

 -@admin-tools

-# drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124)
-tracker-miners
-tracker
-
 ### The KDE-Desktop

 ### fixes

+# use kde-print-manager instead of system-config-printer
+-system-config-printer
+# make sure mariadb lands instead of MySQL (hopefully a temporary hack)
+mariadb-embedded
+mariadb-connector-c
+mariadb-server
+
 # minimal localization support - allows installing the kde-l10n-* packages
+system-config-language
 kde-l10n

-# Additional packages that are not default in kde-* groups, but useful
-fuse
-mediawriter
-
-### space issues
+# unwanted packages from @kde-desktop
+# don't include these for now to fit on a cd
+-desktop-backgrounds-basic
+-kdeaccessibility*
 -ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
 -kipi-plugins			# ~8 megs + drags in Marble
 -krusader			# ~4 megs
 -k3b				# ~15 megs

+#-kdeplasma-addons		# ~16 megs
+
+# Additional packages that are not default in kde-* groups, but useful
+#kdeartwork			# only include some parts of kdeartwork
+fuse
+mediawriter
+
+### space issues
+
+# admin-tools
+-gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
+
 ## avoid serious bugs by omitting broken stuff

 %end
--- a/fedora-kde-minimization.ks
+++ b/fedora-kde-minimization.ks
@ -0,0 +1,8 @@
+# remove input methods to free space
+%packages
+-@input-methods
+-scim*
+-iok
+%end
+
+
--- a/fedora-live-astronomy_kde.ks
+++ b/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
--- a/fedora-live-base.ks
+++ b/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,18 +51,230 @@ 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

-# provide the livesys scripts
-livesys-scripts
+# no longer in @core since 2018-10, but needed for livesys script
+initscripts
+chkconfig
 %end

 %post
-# Enable livesys services
-systemctl enable livesys.service
-systemctl enable livesys-late.service
+# FIXME: it'd be better to get this installed from a package
+cat > /etc/rc.d/init.d/livesys << EOF
+#!/bin/bash
+#
+# live: Init script for live image
+#
+# chkconfig: 345 00 99
+# description: Init script for live image.
+### BEGIN INIT INFO
+# X-Start-Before: display-manager chronyd
+### END INIT INFO
+
+. /etc/init.d/functions
+
+if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then
+    exit 0
+fi
+
+if [ -e /.liveimg-configured ] ; then
+    configdone=1
+fi
+
+exists() {
+    which \$1 >/dev/null 2>&1 || return
+    \$*
+}
+
+livedir="LiveOS"
+for arg in \`cat /proc/cmdline\` ; do
+  if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
+    livedir=\${arg##rd.live.dir=}
+    continue
+  fi
+  if [ "\${arg##live_dir=}" != "\${arg}" ]; then
+    livedir=\${arg##live_dir=}
+  fi
+done
+
+# 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
+
+mountPersistentHome() {
+  # support label/uuid
+  if [ "\${homedev##LABEL=}" != "\${homedev}" -o "\${homedev##UUID=}" != "\${homedev}" ]; then
+    homedev=\`/sbin/blkid -o device -t "\$homedev"\`
+  fi
+
+  # if we're given a file rather than a blockdev, loopback it
+  if [ "\${homedev##mtd}" != "\${homedev}" ]; then
+    # mtd devs don't have a block device but get magic-mounted with -t jffs2
+    mountopts="-t jffs2"
+  elif [ ! -b "\$homedev" ]; then
+    loopdev=\`losetup -f\`
+    if [ "\${homedev##/run/initramfs/live}" != "\${homedev}" ]; then
+      action "Remounting live store r/w" mount -o remount,rw /run/initramfs/live
+    fi
+    losetup \$loopdev \$homedev
+    homedev=\$loopdev
+  fi
+
+  # if it's encrypted, we need to unlock it
+  if [ "\$(/sbin/blkid -s TYPE -o value \$homedev 2>/dev/null)" = "crypto_LUKS" ]; then
+    echo
+    echo "Setting up encrypted /home device"
+    plymouth ask-for-password --command="cryptsetup luksOpen \$homedev EncHome"
+    homedev=/dev/mapper/EncHome
+  fi
+
+  # and finally do the mount
+  mount \$mountopts \$homedev /home
+  # if we have /home under what's passed for persistent home, then
+  # we should make that the real /home.  useful for mtd device on olpc
+  if [ -d /home/home ]; then mount --bind /home/home /home ; fi
+  [ -x /sbin/restorecon ] && /sbin/restorecon /home
+  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
+}
+
+findPersistentHome() {
+  for arg in \`cat /proc/cmdline\` ; do
+    if [ "\${arg##persistenthome=}" != "\${arg}" ]; then
+      homedev=\${arg##persistenthome=}
+    fi
+  done
+}
+
+if strstr "\`cat /proc/cmdline\`" persistenthome= ; then
+  findPersistentHome
+elif [ -e /run/initramfs/live/\${livedir}/home.img ]; then
+  homedev=/run/initramfs/live/\${livedir}/home.img
+fi
+
+# if we have a persistent /home, then we want to go ahead and mount it
+if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; then
+  action "Mounting persistent /home" mountPersistentHome
+fi
+
+if [ -n "\$configdone" ]; then
+  exit 0
+fi
+
+# add liveuser user with no passwd
+action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
+passwd -d liveuser > /dev/null
+usermod -aG wheel liveuser > /dev/null
+
+# Remove root password lock
+passwd -d root > /dev/null
+
+# turn off firstboot for livecd boots
+systemctl --no-reload disable firstboot-text.service 2> /dev/null || :
+systemctl --no-reload disable firstboot-graphical.service 2> /dev/null || :
+systemctl stop firstboot-text.service 2> /dev/null || :
+systemctl stop firstboot-graphical.service 2> /dev/null || :
+
+# don't use prelink on a running live image
+sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink &>/dev/null || :
+
+# turn off mdmonitor by default
+systemctl --no-reload disable mdmonitor.service 2> /dev/null || :
+systemctl --no-reload disable mdmonitor-takeover.service 2> /dev/null || :
+systemctl stop mdmonitor.service 2> /dev/null || :
+systemctl stop mdmonitor-takeover.service 2> /dev/null || :
+
+# don't start cron/at as they tend to spawn things which are
+# disk intensive that are painful on a live image
+systemctl --no-reload disable crond.service 2> /dev/null || :
+systemctl --no-reload disable atd.service 2> /dev/null || :
+systemctl stop crond.service 2> /dev/null || :
+systemctl stop atd.service 2> /dev/null || :
+
+# turn off abrtd on a live image
+systemctl --no-reload disable abrtd.service 2> /dev/null || :
+systemctl stop abrtd.service 2> /dev/null || :
+
+# Don't sync the system clock when running live (RHBZ #1018162)
+sed -i 's/rtcsync//' /etc/chrony.conf
+
+# Mark things as configured
+touch /.liveimg-configured
+
+# add static hostname to work around xauth bug
+# https://bugzilla.redhat.com/show_bug.cgi?id=679486
+# the hostname must be something else than 'localhost'
+# https://bugzilla.redhat.com/show_bug.cgi?id=1370222
+hostnamectl set-hostname "localhost-live"
+
+EOF
+
+# bah, hal starts way too late
+cat > /etc/rc.d/init.d/livesys-late << EOF
+#!/bin/bash
+#
+# live: Late init script for live image
+#
+# chkconfig: 345 99 01
+# description: Late init script for live image.
+
+. /etc/init.d/functions
+
+if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
+    exit 0
+fi
+
+exists() {
+    which \$1 >/dev/null 2>&1 || return
+    \$*
+}
+
+touch /.liveimg-late-configured
+
+# read some variables out of /proc/cmdline
+for o in \`cat /proc/cmdline\` ; do
+    case \$o in
+    ks=*)
+        ks="--kickstart=\${o#ks=}"
+        ;;
+    xdriver=*)
+        xdriver="\${o#xdriver=}"
+        ;;
+    esac
+done
+
+# if liveinst or textinst is given, start anaconda
+if strstr "\`cat /proc/cmdline\`" liveinst ; then
+   plymouth --quit
+   /usr/sbin/liveinst \$ks
+fi
+if strstr "\`cat /proc/cmdline\`" textinst ; then
+   plymouth --quit
+   /usr/sbin/liveinst --text \$ks
+fi
+
+# configure X, allowing user to override xdriver
+if [ -n "\$xdriver" ]; then
+   cat > /etc/X11/xorg.conf.d/00-xdriver.conf <<FOE
+Section "Device"
+	Identifier	"Videocard0"
+	Driver	"\$xdriver"
+EndSection
+FOE
+fi
+
+EOF
+
+chmod 755 /etc/rc.d/init.d/livesys
+/sbin/restorecon /etc/rc.d/init.d/livesys
+/sbin/chkconfig --add livesys
+
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late

 # enable tmpfs for /tmp
 systemctl enable tmp.mount
@ -96,7 +314,7 @@ rm -f /boot/*-rescue*

 # Disable network service here, as doing it in the services line
 # fails due to RHBZ #1369794
-systemctl disable network
+/sbin/chkconfig network off

 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
@ -104,3 +322,17 @@ touch /etc/machine-id

 %end

+
+%post --nochroot
+# For livecd-creator builds only (lorax/livemedia-creator handles this directly)
+if [ -n "$LIVE_ROOT" ]; then
+    cp "$INSTALL_ROOT"/usr/share/licenses/*-release-common/* "$LIVE_ROOT/"
+
+    # only installed on x86, x86_64
+    if [ -f /usr/bin/livecd-iso-to-disk ]; then
+        mkdir -p "$LIVE_ROOT/LiveOS"
+        cp /usr/bin/livecd-iso-to-disk "$LIVE_ROOT/LiveOS"
+    fi
+fi
+
+%end
--- a/fedora-live-budgie.ks
+++ b/fedora-live-budgie.ks
@ -1,17 +0,0 @@
-# Description:
-# - Fedora Live Spin with the Budgie Desktop Environment
-# 
-# Maintainer(s):
-# - Joshua Strobl <joshua@buddiesofbudgie.org>
-
-%include fedora-live-base.ks
-%include fedora-budgie-common.ks
-
-part / --size 7750
-
-%post
-
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="budgie"/' /etc/sysconfig/livesys
-
-%end
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@ -21,8 +21,32 @@ PREFERRED=/usr/bin/cinnamon-session
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="cinnamon"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Cinnamon as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=cinnamon/' /etc/lightdm/lightdm.conf
+
+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# and mark it as executable
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# this goes at the end after all other changes. 
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+EOF

 %end

--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@ -62,12 +62,10 @@ if [ -f `which powerline-daemon` ]; then
 fi
 FOE

-cat >> /var/lib/livesys/livesys-session-extra << FOE
-#Override the favorite desktop application in Dash
-sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
-FOE
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

+#Override the favorite desktop application in Dash
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /etc/rc.d/init.d/livesys
+
 %end
--- a/fedora-live-games.ks
+++ b/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
@ -57,6 +54,7 @@ freecol
 freedoom
 freedroidrpg
 frozen-bubble
+gl-117
 # glob2 - currently broken
 lincity-ng
 #tmw - currently broken
--- a/fedora-live-i3.ks
+++ b/fedora-live-i3.ks
@ -14,7 +14,7 @@
 %include fedora-i3-common.ks

 %post
-# i3 configuration
+# xfce configuration

 # create /etc/sysconfig/desktop (needed for installation)

@ -23,8 +23,37 @@ PREFERRED=/usr/bin/i3
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set i3 as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=i3/' /etc/lightdm/lightdm.conf
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+
+# this goes at the end after all other changes.
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+# setting the wallpaper
+echo "/usr/bin/feh --bg-scale /usr/share/backgrounds/default.png" >> /home/liveuser/.profile
+
+# echoing type liveinst to start the installer
+echo "echo 'Please type liveinst and press Enter to start the installer'" >> /home/liveuser/.bashrc
+
+# fixing the installer non opening bug
+echo "xhost si:localuser:root" >> /home/liveuser/.profile
+
+EOF

 %end

--- a/fedora-live-jam_kde.ks
+++ b/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

@ -63,20 +63,22 @@ thunderbird

 %post

-# Override livesys-kde settings
-cat >> /var/lib/livesys/livesys-session-extra << EOF
-
 #setup kickoff favorites
 /bin/mkdir -p /etc/skel/.config

 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 <<FOE  >> /etc/skel/.config/kickoffrc
+cat <<EOF  >> /etc/skel/.config/kickoffrc
 [Favorites]
 FavoriteURLs=$JAMFAVORITES
-FOE
+EOF

+# Override fedora-live-kde-base.ks settings
+sed -i /etc/rc.d/init.d/livesys -res"#^(FavoriteURLs=).*#\1${JAMFAVORITESLIVE}#"
+
+
+cat >> /etc/rc.d/init.d/livesys << EOF
 /usr/sbin/usermod -a -G jackuser,audio liveuser
 EOF

--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@ -19,7 +19,76 @@ cat > /root/.config/gtk-3.0/settings.ini << EOF
 gtk-theme-name = Adwaita
 EOF

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# are we *not* able to use wayland sessions?
+if strstr "\`cat /proc/cmdline\`" nomodeset ; then
+PLASMA_SESSION_FILE="plasmax11.desktop"
+else
+PLASMA_SESSION_FILE="plasma.desktop"
+fi
+
+# set up autologin for user liveuser
+if [ -f /etc/sddm.conf ]; then
+sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
+sed -i "s/^#Session=.*/Session=\${PLASMA_SESSION_FILE}/" /etc/sddm.conf
+else
+cat > /etc/sddm.conf << SDDM_EOF
+[Autologin]
+User=liveuser
+Session=\${PLASMA_SESSION_FILE}
+SDDM_EOF
+fi
+
+# add liveinst.desktop to favorites menu
+mkdir -p /home/liveuser/.config/
+cat > /home/liveuser/.config/kickoffrc << MENU_EOF
+[Favorites]
+FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop
+MENU_EOF
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+# set executable bit disable KDE security warning
+chmod +x /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
+
+# Set akonadi backend
+mkdir -p /home/liveuser/.config/akonadi
+cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
+[%General]
+Driver=QSQLITE3
+AKONADI_EOF
+
+# "Disable plasma-discover-notifier"
+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 baloo
+cat > /home/liveuser/.config/baloofilerc << BALOO_EOF
+[Basic Settings]
+Indexing-Enabled=false
+BALOO_EOF
+
+# Disable kres-migrator
+cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
+[Migration]
+Enabled=false
+KRES_EOF
+
+# Disable kwallet migrator
+cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL
+[Migration]
+alreadyMigrated=true
+KWALLET_EOL
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF

 %end
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@ -9,9 +9,10 @@

 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
+%include fedora-kde-minimization.ks

 # DVD payload
-part / --size=8000
+part / --size=7200

 %post
 %end
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@ -19,8 +19,46 @@ PREFERRED=/usr/bin/startlxde
 DISPLAYMANAGER=/usr/sbin/lxdm
 EOF

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="lxde"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+# disable screensaver locking and make sure gamin gets started
+cat > /etc/xdg/lxsession/LXDE/autostart << FOE
+/usr/libexec/gam_server
+@lxpanel --profile LXDE
+@pcmanfm --desktop --profile LXDE
+/usr/libexec/notification-daemon
+FOE
+
+# set up preferred apps 
+cat > /etc/xdg/libfm/pref-apps.conf << FOE 
+[Preferred Applications]
+WebBrowser=firefox.desktop
+MailClient=sylpheed.desktop
+FOE
+
+# set up auto-login for liveuser
+sed -i 's/# autologin=.*/autologin=liveuser/g' /etc/lxdm/lxdm.conf
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# create default config for clipit, otherwise it displays a dialog on startup
+mkdir -p /home/liveuser/.config/clipit
+cat > /home/liveuser/.config/clipit/clipitrc  << FOE
+[rc]
+use_copy=true
+save_uris=true
+save_history=false
+statics_show=true
+single_line=true
+FOE
+
+# this goes at the end after all other changes.
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+EOF

 %end

--- a/fedora-live-lxqt.ks
+++ b/fedora-live-lxqt.ks
@ -16,8 +16,42 @@ dracut-config-generic
 %end

 %post
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="lxqt"/' /etc/sysconfig/livesys
+# add initscript
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+# set up autologin for user liveuser
+if [ -f /etc/sddm.conf ]; then
+sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=lxqt.desktop/' /etc/sddm.conf
+else
+cat > /etc/sddm.conf << SDDM_EOF
+[Autologin]
+User=liveuser
+Session=lxqt.desktop
+SDDM_EOF
+fi
+
+# show liveinst.desktop on desktop and in menu
+sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/
+
+# set up preferred apps 
+cat > /etc/xdg/libfm/pref-apps.conf << FOE 
+[Preferred Applications]
+WebBrowser=qupzilla.desktop
+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/
+
+EOF

 %end

--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@ -10,7 +10,42 @@
 part / --size 8192

 %post
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="mate"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+fi
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# and mark it as executable
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set MATE as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=mate/' /etc/lightdm/lightdm.conf
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+EOF

 %end
--- a/fedora-live-minimization.ks
+++ b/fedora-live-minimization.ks
@ -4,6 +4,13 @@
 %packages

 # save some space
+-mpage
 -hplip
+-isdn4k-utils
+
+# scanning takes quite a bit of space :/
+-xsane
+-xsane-gimp
+-sane-backends

 %end
--- a/fedora-live-robotics.ks
+++ b/fedora-live-robotics.ks
@ -1,6 +1,5 @@
-# Maintained by x3mboy and the Fedora Robotics SIG:
-# https://fedoraproject.org/wiki/SIGs/Robotics
-# mailto:x3mboy@fedoraproject.org
+# Maintained by the Fedora Robotics SIG:
+# http://fedoraproject.org/wiki/SIGs/Robotics
 # mailto:robotics@lists.fedoraproject.org

 %include fedora-live-base.ks
@ -90,9 +89,9 @@ mercurial

 %end

+# Rip the post-configuration from the live-desktop, set default shortcuts to IDEs 
 %post
-# Extend the post-configuration from the live-desktop, set default shortcuts to IDEs
-cat >> /var/lib/livesys/livesys-session-extra << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
 # disable screensaver locking
 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
 [org.gnome.desktop.screensaver]
@ -105,6 +104,12 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override <
 disable-lock-screen=true
 FOE

+# disable updates plugin
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
+[org.gnome.software]
+download-updates=false
+FOE
+
 # make the installer show up
 if [ -f /usr/share/applications/liveinst.desktop ]; then
  # Show harddisk install in shell dash
@ -122,5 +127,17 @@ fi
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

+# set up auto-login
+cat > /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
 EOF
 %end
--- a/fedora-live-security.ks
+++ b/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!
@ -102,7 +101,50 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+mkdir -p /home/liveuser/.config/xfce4
+
+cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
+MailReader=sylpheed-claws
+FileManager=Thunar
+WebBrowser=midori
+FOE
+
+# disable screensaver locking (#674410)
+cat >> /home/liveuser/.xscreensaver << FOE
+mode:           off
+lock:           False
+dpmsEnabled:    False
+FOE
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# deactivate xfce4-panel first-run dialog (#693569)
+mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
+cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Xfce as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# and mark it as executable (new Xfce security feature)
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# this goes at the end after all other changes. 
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+EOF

 %end
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@ -13,7 +13,37 @@

 %post

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+EOF
+
+cat >> /etc/rc.d/init.d/livesys-late << EOF
+
+# disable screensaver locking
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
+[org.gnome.desktop.screensaver]
+lock-enabled=false
+FOE
+
+# and hide the lock screen option
+cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
+[org.gnome.desktop.lockdown]
+disable-lock-screen=true
+FOE
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+chmod 755 /etc/rc.d/init.d/livesys-late
+/sbin/restorecon /etc/rc.d/init.d/livesys-late
+/sbin/chkconfig --add livesys-late

 %end
--- a/fedora-live-sway.ks
+++ b/fedora-live-sway.ks
@ -1,32 +0,0 @@
-# fedora-livecd-sway.ks
-#
-# Description:
-# - Fedora Live Spin with the tiling window manager Sway
-#
-# Maintainer(s):
-# - Aleksei Bavshin         <alebastr89@gmail.com>
-# - Jiří Konečný            <jkonecny@redhat.com>
-# - Anthony Rabbito         <hello@anthonyrabbito.com>
-# - Fabio Alessandro Locati <me@fale.io>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-sway-common.ks
-
-%packages
-# To be able to show installation instructions on background
-nwg-wrapper
-%end
-
-%post
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/sway
-DISPLAYMANAGER=/bin/sddm
-EOF
-
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="sway"/' /etc/sysconfig/livesys
-
-%end
-
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@ -10,11 +10,92 @@
 #
 #include snippets/packagekit-cached-metadata.ks

-part / --size 7750
+part / --size 7680

 %post

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
+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]
+download-updates=false
+FOE
+
+# don't autostart gnome-software session service
+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
+DefaultDisabled=true
+FOE
+
+# don't run gnome-initial-setup
+mkdir ~liveuser/.config
+touch ~liveuser/.config/gnome-initial-setup-done
+
+# suppress anaconda spokes redundant with gnome-initial-setup
+cat >> /etc/sysconfig/anaconda << FOE
+[NetworkSpoke]
+visited=1
+
+[PasswordSpoke]
+visited=1
+
+[UserSpoke]
+visited=1
+FOE
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+  # need to move it to anaconda.desktop to make shell happy
+  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+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
+  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
+    mkdir -p ~liveuser/.config/autostart
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
+  fi
+
+  # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+welcome-dialog-last-shown-version='4294967295'
+FOE
+
+  # Copy Anaconda branding in place
+  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
+    cp -a /usr/share/lorax/product/* /
+  fi
+fi
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up auto-login
+cat > /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF

 %end
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@ -26,8 +26,54 @@ PREFERRED=/usr/bin/startxfce4
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF

-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="xfce"/' /etc/sysconfig/livesys
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+mkdir -p /home/liveuser/.config/xfce4
+
+cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
+MailReader=sylpheed-claws
+FileManager=Thunar
+WebBrowser=firefox
+FOE
+
+# disable screensaver locking (#674410)
+cat >> /home/liveuser/.xscreensaver << FOE
+mode:           off
+lock:           False
+dpmsEnabled:    False
+FOE
+
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# deactivate xfce4-panel first-run dialog (#693569)
+mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
+cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Xfce as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
+
+# Show harddisk install on the desktop
+sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
+mkdir /home/liveuser/Desktop
+cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
+
+# no updater applet in live environment
+rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop
+
+# and mark it as executable (new Xfce security feature)
+chmod +x /home/liveuser/Desktop/liveinst.desktop
+
+# this goes at the end after all other changes. 
+chown -R liveuser:liveuser /home/liveuser
+restorecon -R /home/liveuser
+
+EOF

 %end

--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@ -4,6 +4,7 @@ microdnf
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
+-xkeyboard-config
 # recommended by iproute, we don't want it in minimal
 -iproute-tc
 # recommended by gnutls, we don't want it in minimal
--- a/fedora-modular-arm-server.ks
+++ b/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
+
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@ -56,9 +56,17 @@ sssd-client

 # Find the architecture we are on
 arch=$(uname -m)
+
 # Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+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}')
--- a/fedora-phosh-common.ks
+++ b/fedora-phosh-common.ks
@ -1,13 +0,0 @@
-# fedora-phosh-common.ks
-#
-# Description:
-# - Fedora Disk image Spin with the phosh window manager
-#
-# Maintainer(s):
-# - Kevin Fenzi       <kevin@scrye.com>
-
-%packages
-# install env-group to resolve RhBug:1891500
-@^phosh-desktop-environment
-
-%end
--- a/fedora-python-classroom-common.ks
+++ b/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
--- a/fedora-python-classroom-gnome-common.ks
+++ b/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
--- a/fedora-repo.ks
+++ b/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
--- a/fedora-scientific-common.ks
+++ b/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
@ -133,6 +124,7 @@ tmux
 rlwrap
 hexchat
 fig2ps
+bibtex2html
 hevea

 #Include Mozilla Firefox
--- a/fedora-server-vm-full.ks
+++ b/fedora-server-vm-full.ks
@ -1,201 +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 text mode 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
-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 on 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 is an optional install item on disk media.
-# Install options not available with VMs. So we don't include it
-# despite trying to resemble a DVD installation as close as possible.
-##@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 .
-
-# When we build the image /var/log gets populated.
-# Let's clean it up.
-echo "Cleanup leftover in /var/log"
-rm -rf /var/log/*
-
-%end
-##### end custom post script ########################################
--- a/fedora-soas-common.ks
+++ b/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
-
--- a/fedora-sway-common.ks
+++ b/fedora-sway-common.ks
@ -1,17 +0,0 @@
-# fedora-livecd-sway.ks
-#
-# Description:
-# - Fedora Live Spin with the tiling window manager Sway
-#
-# Maintainer(s):
-# - Aleksei Bavshin         <alebastr89@gmail.com>
-# - Jiří Konečný            <jkonecny@redhat.com>
-# - Anthony Rabbito         <hello@anthonyrabbito.com>
-# - Fabio Alessandro Locati <me@fale.io>
-
-%packages
-fedora-release-sway
-@^sway-desktop-environment
-@firefox
-@swaywm-extended
-%end
--- a/l10n/fedora-livecd-lxde-ja_JP.ks
+++ b/l10n/fedora-livecd-lxde-ja_JP.ks
@ -26,7 +26,7 @@ imsettings
 %end

 %post
-cat >> /var/lib/livesys/livesys-session-extra << EOF
+cat >> /etc/rc.d/init.d/livesys << EOF
 #### setting env and start ibus-deamon ####
 #mkdir /home/liveuser
 cat >> /home/liveuser/.bash_profile << FOE
--- a/maintainers.toml
+++ b/maintainers.toml
@ -28,19 +28,19 @@ fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]

 [spins.soas.x86_64]
-fas = [ "chimosky", "aperezbios" ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
+fas = [ "chimosky", "aperezbios", "pbrobinson" ]
+maintainers = [ "Chihurumnaya Ibiam", "Alex Perez", "Peter Robinson" ]
 [spins.soas.armhfp]
-fas = [ "chimosky", "aperezbios", ]
-maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
+fas = [ "chimosky", "aperezbios", "pbrobinson" ]
+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"]
-maintainers = [ "Fabian Affolter", "Joerg Simon", "JT Pennington" ]
+fas = [ "fab", "jsimon" ]
+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" ]
-maintainers = [ "Darryl T. Agostinelli", "Richard Anaya" ]
+fas = [ "dagostinelli" ]
+maintainers = [ "Darryl T. Agostinelli" ]

 [labs.jam_kde.x86_64]
-fas = [ "q5sys" ]
-maintainers = [ "JT Pennington" ]
+fas = [ "eeickmeyer" ]
+maintainers = [ "Erich Eickmeyer" ]

 [labs.python_classroom.x86_64]
 fas = [ "churchyard", "python-sig" ]
@ -71,21 +71,9 @@ fas = [ "scitech" ]
 maintainers = [ "SciTech SIG" ]

 [labs.robotics.x86_64]
-fas = [ "x3mboy", "robotics-sig" ]
-maintainers = [ "Eduard Lucena", "Robotics SIG" ]
+fas = [ "rmattes", "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" ]
-
-[spins.budgie.x86_64]
-fas = [ "joshstrobl" ]
-maintainers = [ "Joshua Strobl" ]
-
-[spins.sway.x86_64]
-fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
-maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
Author	SHA1	Message	Date
raveit65	022f04580e	Mate: use earlyoom instead of systemd-oomd-defaults	2022-04-01 13:14:20 +02:00
Mohan Boddu	dec45e0950	KDE size increase Fixing https://pagure.io/releng/failed-composes/issue/2567#comment-737735 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2022-02-04 13:01:23 -08:00
Peter Robinson	97d917eeda	IoT: Update for stable F-34 Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2021-04-28 14:04:41 +01:00
Adam Williamson	49b20ffebd	Escape ${PLASMA_SESSION_FILE} ...because this is a shell script created by a pile of echo commands. I mean, obviously. Duh. Nothing hard to understand here! Signed-off-by: Adam Williamson <awilliam@redhat.com>	2021-04-22 23:34:44 -07:00
Neal Gompa	75e442287b	kde: Fallback to Plasma X11 session for basic graphics mode (#1952431 ) The Plasma Wayland session does not work when kernel mode-setting has been disabled, so fall back to X11 automatically in this scenario. Signed-off-by: Neal Gompa <ngompa13@gmail.com>	2021-04-23 00:12:59 -04:00
Paul Whalen	ff50e7a432	Remove asterisk from kernel-lpae for exclusion (#1947157 ).	2021-04-12 12:05:17 -04:00
Dennis Gilmore	92b54dd826	Do not install kernel-lpae on 32 bit arm There is a potential issue with how dtb files are symlinked in /boot if the kernel-lpae is installed last the symlink is pointed there and not all dtb files will be available. kernel-lpae should be installed intentionally Signed-off-by: Dennis Gilmore <dennis@ausil.us>	2021-04-06 08:27:31 -05:00
Luya Tshimbalanga	b58fae9220	Use Workstation installation from live media Signed-off-by: Luya Tshimbalanga <luya@fedoraproject.org>	2021-04-05 17:41:09 +00:00
Clement Verna	a2bd1f7269	cracklib-dicts is now a hard dependency of libpwquality `a1b5a1af0a` Signed-off-by: Clement Verna <cverna@tutanota.com>	2021-04-02 13:21:24 +02:00
Kevin Fenzi	d7bf171024	Merge #791 `kde: disable plasma-discover-notifier on live image`	2021-03-25 00:23:35 +00:00
Rex Dieter	74fb549b00	kde: disable plasma-discover-notifier on live image Migrate snippet from plasma-pk-updates to plasma-discover-notifier (cherry picked from commit `0b624bcd11`)	2021-03-22 14:36:32 -05:00
Luc Ducazu	63cb75390c	Reduce the size of the scientific image (Bug 1915271).	2021-03-20 15:48:46 +01:00
Adam Williamson	0591bde498	Use correct `@^` for i3 env group, not just `@` Signed-off-by: Adam Williamson <awilliam@redhat.com>	2021-03-12 18:49:36 -08:00
Odilon Sousa	47f3720431	Cleaning the packages that are already present on @i3-desktop-environment	2021-03-13 02:48:16 +00:00
Odilon Sousa	cd9b1a5302	Adding @hardware-support for I3 Spin	2021-03-13 02:48:16 +00:00
Paul Whalen	6fddbc0a50	Add initial-setup-gui to fedora-disk-xbase.ks Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>	2021-03-11 11:06:38 -05:00
Kevin Fenzi	4fa6ca57fd	maintainers.toml: fix stray quote that was messing up compose tracker Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2021-03-05 10:44:31 -08:00
Odilon Sousa	6856cb0100	Changing from i3wm to i3	2021-02-28 19:43:03 -03:00
Odilon Sousa	d8641276d4	Adding @base-x and updating the maintainers.toml file	2021-02-28 19:38:10 -03:00
Luya Tshimbalanga	2b72cd2e95	Revert removed workstation-release and fix post-installation This commit restore workstation-release needed for workstation base installation and attempt to fix post-installation favourite apps on dash board. Signed-off-by: Luya Tshimbalanga <luya@fedoraproject.org>	2021-02-22 17:20:50 -08:00
Timothée Ravier	8fa7fd90c5	fedora-kde-common: Remove ktorrent, krusader & k3b	2021-02-22 23:59:33 +00:00
Timothée Ravier	bbdcb87503	fedora-kde-common: Amarok is not included anymore	2021-02-22 23:59:33 +00:00
Timothée Ravier	0102e25d4f	fedora-kde-common: Only ship Firefox by default	2021-02-22 23:59:33 +00:00
Timothée Ravier	4b7fc459ee	fedora-kde-common: Use libreoffice instead of kde-office	2021-02-22 23:59:33 +00:00
Peter Robinson	702ce7ddfd	arm: changes for the UEFI on ARMv7 Primarily changes for UEFI on ARMv7 but also some cleanups/updates for the arm/aarch64 images. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2021-02-18 18:09:28 +00:00
Dan Book	8a9f16e08d	Cinnamon - update background extras to f34	2021-02-17 20:12:01 -05:00
Kalev Lember	71a2e82031	Drop a gsetting command that didn't actually do anything Same as the previous commit, it only changed the value as root and didn't actually affect the liveuser.	2021-02-17 21:18:16 +01:00
Kalev Lember	1c906904c6	Disable GNOME 40 welcome tour harder Commit `3dadef5a21` didn't actually work because it set the value as root. This commit fixes it to set it under the liveuser instead. Thanks to adamw for figuring out what's going on!	2021-02-17 21:18:16 +01:00
Christian Dersch	adfd669d62	astronomy: Remove some obsolete packages, add java	2021-02-17 18:56:25 +01:00
Kalev Lember	52a40aeec0	Drop references to retired gnome-getting-started-docs	2021-02-17 17:09:21 +01:00
Odilon Junior	ebe685359f	Kickstart for I3-Spin	2021-02-16 22:07:20 +00:00
Bastien Nocera	5cf7114f3d	Disable GNOME 40 welcome tour in Live CD	2021-02-16 22:50:13 +01:00
Ankur Sinha (Ankur Sinha Gmail)	52defb10a2	Comp-neuro: add python-niapy Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>	2021-02-15 16:56:25 +00:00
Ankur Sinha (Ankur Sinha Gmail)	db5ba67f13	Comp-neuro lab: add new packages, remove orphaned, clean up - remove docs to reduce size - remove R and Julia to reduce size - remove orphaned nineml - add pynn - re-add paraview - add neuron-devel (required to compile NEURON mod files) Also update project URL. Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>	2021-02-15 15:47:06 +00:00
Peter Robinson	7d4e99d431	IoT: setup ostree from f34/devel branched Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2021-02-14 19:13:56 +00:00
Tomas Hrcka	8cd2561c90	Branching F34 from rawhide Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2021-02-09 14:34:16 +01:00