From eab4fdc148f58e61d17e975c2dfe6181137daaa4 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Dec 17 2023 23:00:13 +0000
Subject: fedora-container-toolbox: drop systemd


Since change 48e2c3b5598de32f6dabfb5d1985d17aeab97d58 this kickstart
is pulling in systemd.

This was noticed because since
49306cb6eada8777eafc2fa7f93f16008c2e93a5 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

---

diff --git a/fedora-container-toolbox.ks b/fedora-container-toolbox.ks
index 89e8ee9..3c7dad6 100644
--- a/fedora-container-toolbox.ks
+++ b/fedora-container-toolbox.ks
@@ -82,7 +82,10 @@ 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