Skip to content

Commit 33da4f4

Browse files
committed
fix(xsettings): restrict service to X11 session only
1. Add ExecCondition to XSettings service to skip on Wayland sessions 2. Add session type condition to plugin JSON for X11-only loading Log: Restrict the XSettings plugin and service to X11 session only fix(xsettings): 限制服务仅在 X11 会话下运行 1. 为 XSettings 服务添加 ExecCondition,在 Wayland 会话时跳过启动 2. 为插件 JSON 添加 sessionType 条件,仅 X11 下加载 Log: 限制 XSettings 插件和服务仅在 X11 会话下运行 PMS: BUG-367635
1 parent c448b21 commit 33da4f4

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

src/plugin-qt/xsettings/misc/org.deepin.dde.XSettings1.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ After=treeland-sd.service
1111
[Service]
1212
Type=dbus
1313
BusName=org.deepin.dde.XSettings1
14+
ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" != "wayland" || exit 2'
1415
ExecStart=/usr/bin/deepin-service-manager -n org.deepin.dde.XSettings1
1516
Restart=on-failure
1617
RestartSec=3

src/plugin-qt/xsettings/misc/plugin-dde-xsettings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"libPath": "libplugin-dde-xsettings.so",
44
"startType": "Resident",
55
"pluginType": "qt",
6+
"condition": {
7+
"sessionType": "x11"
8+
},
69
"policy": [
710
{
811
"path": "/org/deepin/dde/XSettings1"

0 commit comments

Comments
 (0)