File 0002-startkde-Close-systemd-session-when-startp... of Package plasma6-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-startkde-Close-systemd-session-when-startplasma-exit.patch of Package plasma6-workspace (Revision 27e1798cc5c6f5bcd7038553157a3291)

Currently displaying revision 27e1798cc5c6f5bcd7038553157a3291 , Show latest

From a487779f01c3d2f876dde434d8855dffbf00d77f Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Thu, 6 Jun 2024 23:34:41 +0300
Subject: [PATCH 2/2] startkde: Close systemd session when startplasma exits

Startplasma is the session leader managed by the display manager,
Anything started by systemd needs tearing down explicitly.

On logout or shutdown we correctly stop the graphical-session target and
then startplasma quits.

If SDDM is restarted the order happens in reverse. startpasma quits, but
we also need our units to close. Otherwise we end up in a situation
where we're at the login manager but with all our background services
continuing to run.

Given startplasma starts the plasma-workspace target it's our
responsibility to make sure this target gets stopped.

This is an alternative to 0ff2e9a70ccfa96b82fd6d2ea5a0a8545a5e3a60 but
considerably simpler. It doesn't handle the case of startplasma crashing
or being SIGKILLED, but is considerably simpler.
---
 startkde/startplasma-wayland.cpp |  1 +
 startkde/startplasma-x11.cpp     |  2 +-
 startkde/startplasma.cpp         | 15 +++++++++++++++
 startkde/startplasma.h           |  1 +
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp
index 9196f27a7e..ba4479bb98 100644
--- a/startkde/startplasma-wayland.cpp
+++ b/startkde/startplasma-wayland.cpp
@@ -86,6 +86,7 @@ int main(int argc, char **argv)
     runSync(QStringLiteral("kdeinit5_shutdown"), {});
 
     out << "startplasmacompositor: Shutting down...\n";
+    stopSystemdSession();
     cleanupPlasmaEnvironment(oldSystemdEnvironment);
     out << "startplasmacompositor: Done.\n";
 
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index 3f7c6fa7c7..d18b9ce1cf 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -85,10 +85,10 @@ int main(int argc, char **argv)
     waitForKonqi();
 
     out << "startkde: Shutting down...\n";
-
     // Keep for KF5; remove in KF6 (KInit will be gone then)
     runSync(QStringLiteral("kdeinit5_shutdown"), {});
 
+    stopSystemdSession();
     cleanupPlasmaEnvironment(oldSystemdEnvironment);
 
     out << "startkde: Done.\n";
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index 7b82d72464..8a4f2dd52d 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -737,6 +737,21 @@ bool startPlasmaSession(bool wayland)
     return rc;
 }
 
+void stopSystemdSession()
+{
+    // Generally plasma-workspace.target will have already marked itself as stopped
+    // when the session ends gracefully.
+
+    // However, we also need to handle the reverse case where the login manager restarts and
+    // startplasma is terminated first. This should trigger a cleanup of the systemd services we started.
+    auto msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.systemd1"),
+                                              QStringLiteral("/org/freedesktop/systemd1"),
+                                              QStringLiteral("org.freedesktop.systemd1.Manager"),
+                                              QStringLiteral("StopUnit"));
+    msg << QStringLiteral("plasma-workspace.target") << QStringLiteral("fail");
+    QDBusConnection::sessionBus().call(msg);
+}
+
 void waitForKonqi()
 {
     const KConfig cfg(QStringLiteral("startkderc"));
diff --git a/startkde/startplasma.h b/startkde/startplasma.h
index 0241db1a81..9299ae78bd 100644
--- a/startkde/startplasma.h
+++ b/startkde/startplasma.h
@@ -33,6 +33,7 @@ QProcess *setupKSplash();
 
 bool startPlasmaSession(bool wayland);
 
+void stopSystemdSession();
 void waitForKonqi();
 
 void playStartupSound();
-- 
2.45.1

Places

File 0002-startkde-Close-systemd-session-when-startplasma-exit.patch of Package plasma6-workspace (Revision 27e1798cc5c6f5bcd7038553157a3291)

Places