Remove extraneous files, enable dbus in base

flatcar · Apr 30, 2024 · c036bb6 · c036bb6
1 parent c66f25a
commit c036bb6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 37 deletions.
diff --git a/build_library/sysext_mangle_flatcar-podman b/build_library/sysext_mangle_flatcar-podman
@@ -17,38 +17,4 @@ w /etc/subuid - - - - core:1065536:65536
 w /etc/subgid - - - - core:1065536:65536
 EOF
 
-mkdir -p ./usr/lib/systemd/network
-
-cat <<EOF >>./usr/lib/systemd/network/50-podman.network
-[Match]
-Type=bridge
-Name=podman*
-
-[Link]
-Unmanaged=yes
-EOF
-
-cat <<EOF >>./usr/lib/systemd/user/dbus.service
-[Unit]
-Description=D-Bus User Message Bus
-Documentation=man:dbus-daemon(1)
-Requires=dbus.socket
-
-[Service]
-ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
-ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
-EOF
-
-cat <<EOF >>./usr/lib/systemd/user/dbus.socket
-[Unit]
-Description=D-Bus User Message Bus Socket
-
-[Socket]
-ListenStream=%t/bus
-ExecStartPost=-/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
-EOF
-
-mkdir -p ./usr/lib/systemd/user/sockets.target.wants
-ln -s ../dbus.socket ./usr/lib/systemd/user/sockets.target.wants/dbus.socket
-
 popd
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.14.4-r2.ebuild
@@ -137,9 +137,7 @@ multilib_src_configure() {
 		--disable-kqueue
 		$(use_enable elogind)
 		$(use_enable systemd)
-		# Flatcar: disable user sessions
-		# $(use_enable systemd user-session)
-		--disable-user-session
+		$(use_enable systemd user-session)
 		--disable-embedded-tests
 		--disable-modular-tests
 		$(use_enable debug stats)