fedora-container-toolbox: drop systemd

Since change 48e2c3b559 this kickstart
is pulling in systemd.

This was noticed because since
b5fc5fd17d started bringing in
weak-dependencies, we started installing systemd-resolved is which
created a symlinked /etc/resolv.conf in the image.  Toolbox will not
currently reset this on container start, as it is a symlink (this
behaviour is a bit complicated; see [1]).  This leads to an
incompatability running the toolbox on *non* systemd-resolved hosts
(e.g. RHEL9); you are left with a dangling symlink and no
name-resolution in the toolbox.

We do not want systemd in the toolbox image by default it; remove it
from the list.  Exclude systemd-resolved specifically, so if something
else brings in systemd we still don't include this.

[1] https://github.com/containers/toolbox/issues/1410

https://pagure.io/fedora-kickstarts/pull-request/1027

fedora-container-toolbox.ks

@@ -1,26 +1,42 @@
 # Kickstart file for Fedora Toolbox
 
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
-# This base is a standard Fedora image with python3 and dnf
 
-%include fedora-container-common.ks
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+bootloader --disabled
+timezone --isUtc Etc/UTC
+timesource --ntp-disable
+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
 
 # Install packages
-%packages --inst-langs=en --nocore --exclude-weakdeps
+%packages --nocore
 acl
 bash
 bash-completion
 bc
 bzip2
+coreutils
 coreutils-common
 curl
 diffutils
 dnf
 dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 dnf-plugins-core
+-dosfstools
+-e2fsprogs
+fedora-release-container
 findutils
 flatpak-spawn
 fpaste
+-fuse-libs
 gawk
 git
 -glibc-minimal-langpack
@@ -28,15 +44,18 @@ glibc-all-langpacks
 gnupg2
 gnupg2-smime
 grep
+-grubby
 gvfs-client
 gzip
 hostname
 iproute
 iputils
+-kernel
 keyutils
 krb5-libs
 less
 libcap
+-libss
 lsof
 man-db
 man-pages
@@ -51,30 +70,39 @@ p11-kit
 pam
 passwd
 pigz
+-pinentry
 procps-ng
+psmisc
 python3
 rootfiles
 rpm
 rsync
 sed
 shadow-utils
+-shared-mime-info
+-sssd-client
 sudo
-systemd
+# This is a weak dependency of systemd, we do not want
+# this in the container; see
+#  https://github.com/containers/toolbox/issues/1410
+-systemd-resolved
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 tcpdump
 time
 traceroute
 tree
+-trousers
 unzip
 util-linux
 util-linux-core
-vim-enhanced
+vim-minimal
 vte-profile
 vulkan-loader
 wget
 which
 whois
 words
+-xkeyboard-config
 xorg-x11-xauth
 xz
 zip
@@ -90,6 +118,33 @@ rm -f /mnt/sysimage/etc/rpm/macros.image-language-conf
 
 # Remove 'tsflags=nodocs' line from dnf.conf
 sed -i '/tsflags=nodocs/d' /mnt/sysimage/etc/dnf/dnf.conf
+%end
+
+%post --erroronfail --log=/root/anaconda-post.log
+set -eux
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
+echo 'LANG="C.UTF-8"' >  /etc/locale.conf
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
+echo "Import RPM GPG key"
+releasever=$(rpm --eval '%{?fedora}')
+
+# When building ELN containers, we don't have the %{fedora} macro
+if [ -z $releasever ]; then
+  releasever=eln
+fi
+
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
+
+echo "# fstab intentionally empty for containers" > /etc/fstab
+
+# Remove machine-id on pre generated images
+rm -f /etc/machine-id
+touch /etc/machine-id
+
+echo "# resolv placeholder" > /etc/resolv.conf
+chmod 644 /etc/resolv.conf
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1343138
 # Fix /run/lock breakage since it's not tmpfs in docker

fedora-design-suite-common.ks

@@ -12,7 +12,6 @@ deja-dup
 # Add extra gnome applications
 #gnome-books
 gnome-calendar
-gnome-photos
 gnome-pomodoro
 gnome-todo
 

fedora-i3-common.ks

@@ -24,6 +24,8 @@ gnome-keyring-pam
 wget
 # Better more popular browser
 system-config-printer
+# Install XFCE polkit
+xfce-polkit
 
 # save some space
 -autofs

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/39/${basearch}/iot
 
 reboot
 
@@ -34,14 +34,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/39/${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/39/${arch}/iot" --create "fedora-iot:fedora/39/${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/39/${arch}/iot" --delete
 
 # delete/add the remote with new options to enable gpg verification
 # and to point them at the cdn url

fedora-live-astronomy_kde.ks

@@ -96,7 +96,10 @@ python3-matplotlib-tk
 
 
 # Python IDE very useful for scientific use
-python3-spyder
+# FTI with Python 3.12:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
+# can be restored when that is fixed
+#python3-spyder
 
 # BOINC for distributed computing
 boinc-client

fedora-live-base.ks

@@ -39,6 +39,7 @@ anaconda-live
 # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
 -fcoe-utils
 -device-mapper-multipath
+-sdubby
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts

fedora-live-i3.ks

@@ -23,6 +23,15 @@ PREFERRED=/usr/bin/i3
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
+
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2240823
+cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Name=xfce-polkit
+Exec=/usr/libexec/xfce-polkit
+EOF
+
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys
 

fedora-live-kde.ks

@@ -11,7 +11,7 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=8000
+part / --size=9000
 
 %post
 %end

fedora-live-security.ks

@@ -45,6 +45,7 @@ gnome-keyring-pam
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
+-default-fonts-core-math
 -ibus-typing-booster
 -xfce4-sensors-plugin
 -man-pages-*

fedora-live-soas.ks

@@ -13,6 +13,14 @@
 
 %post
 
+# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2239137
+cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
+[Desktop Entry]
+Type=Application
+Name=xfce-polkit
+Exec=/usr/libexec/xfce-polkit
+EOF
+
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
 

fedora-lxde-common.ks

@@ -49,6 +49,7 @@ metacity
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
+-default-fonts-core-math
 -ibus-typing-booster
 -xscreensaver-extras
 #-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps

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

@@ -61,7 +61,10 @@ julia
 julia-doc
 julia-devel
 
-python3-spyder
+# FTI with Python 3.12:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
+# can be restored when that is fixed
+#python3-spyder
 python3-spyder-kernels
 
 

fedora-soas-common.ks

@@ -65,6 +65,9 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 
+# Install XFCE polkit
+xfce-polkit
+
 %end
 
 %post