Skip to content

Commit 4b11641

Browse files
committed
fix: will cause kde to fail to start
kde will start kwin, which will cause dde-session@x11/wayland.service to start as a dbus service. Log:
1 parent bb74fbf commit 4b11641

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

systemd/dde-session-initialized.target.wants/dde-osd.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Before=dde-session-initialized.target
1818
[Service]
1919
Type=dbus
2020
BusName=org.freedesktop.Notifications
21+
ExecCondition=/bin/sh -c 'test "$XDG_CURRENT_DESKTOP" = "DDE" || exit 2'
2122
ExecStart=/usr/lib/deepin-daemon/dde-osd
2223
TimeoutStartSec=infinity
2324
Slice=session.slice

systemd/dde-session@wayland.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ PartOf=graphical-session.target
1818

1919
[Service]
2020
Slice=session.slice
21-
BusName=org.kde.KWinWrapper
22-
Type=dbus
21+
Type=simple
2322
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
2423
# the [Unit] section with systemd >= 246. Also, the current solution is
2524
# kind of painful as systemd had a bug where it retries the condition.
@@ -36,3 +35,4 @@ ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemct
3635
Restart=no
3736
# Kill any stubborn child processes after this long
3837
TimeoutStopSec=5
38+
TimeoutStartSec=infinity

systemd/dde-session@x11.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ StartLimitBurst=1
2222

2323
[Service]
2424
Slice=session.slice
25-
BusName=org.kde.KWin
26-
Type=dbus
25+
Type=simple
2726
# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
2827
# the [Unit] section with systemd >= 246. Also, the current solution is
2928
# kind of painful as systemd had a bug where it retries the condition.
@@ -41,3 +40,4 @@ Restart=always
4140
RestartSec=0ms
4241
# Kill any stubborn child processes after this long
4342
TimeoutStopSec=5
43+
TimeoutStartSec=infinity

0 commit comments

Comments
 (0)