Commit 399cf129 authored by David Edmundson's avatar David Edmundson
Browse files

Enforce SESSION_MANAGER is exported before plasmashell is started

Wants says we should bring ksmserver up, but by default that could be in
any order, we need to define it. kcminit also potentially exports
environment variables.

This was written with the correct order in-mind but the wrong keyword
used.  We don't need "Wants" as plasma-core.target already defines that
we will be loading them along with plasmashell.

It is important that ksmserver is up and has completed exporting the
SESSION_MANAGER env, otherwise plasmashell will not propogate it so
applications it launches introducing an X session regression


(cherry picked from commit 19ba5f1c)
parent 849cb67f
...@@ -582,7 +582,7 @@ KSMServer::KSMServer(InitFlags flags) ...@@ -582,7 +582,7 @@ KSMServer::KSMServer(InitFlags flags)
setenv("SESSION_MANAGER", session_manager, true); setenv("SESSION_MANAGER", session_manager, true);
auto updateEnvJob = new UpdateLaunchEnvJob(QStringLiteral("SESSION_MANAGER"), QString::fromLatin1(session_manager)); auto updateEnvJob = new UpdateLaunchEnvJob(QStringLiteral("SESSION_MANAGER"), QString::fromLatin1(session_manager));
updateEnvJob->start(); updateEnvJob->exec();
free(session_manager); free(session_manager);
} }
......
[Unit] [Unit]
Description=KDE Plasma Workspace Description=KDE Plasma Workspace
Wants=plasma-ksmserver.service plasma-kcminit.service After=plasma-ksmserver.service plasma-kcminit.service
PartOf=graphical-session.target PartOf=graphical-session.target
[Service] [Service]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment