Commit 8d55bf8
committed
fix: replace legacy keyring script with systemd service
Remove legacy Xsession script 97deepin-keyring-wb and replace it with a
new systemd service dde-keyring.service. The legacy script was causing
xrdp remote login issues because it unconditionally started deepin-
keyring-whitebox client, which would block in xrdp sessions. The new
service includes a check for XRDP_SESSION environment variable to avoid
starting the whitebox client in remote sessions.
The changes include:
1. Remove 97deepin-keyring-wb from Xsession scripts list
2. Delete the legacy script file
3. Add new dde-keyring.service systemd unit
4. Configure the service to start after dbus socket
5. Add XRDP_SESSION check to conditionally start whitebox client
6. Integrate the service into dde-session-pre.target
Log: Fixed xrdp remote login blocked by keyring service
Influence:
1. Test normal desktop login to ensure keyring services start correctly
2. Test xrdp remote login to verify whitebox client is not started
3. Verify gnome-keyring-daemon starts in both local and remote sessions
4. Check systemd service status and logs for proper operation
5. Test session shutdown to ensure clean service termination
fix: 替换遗留密钥脚本为 systemd 服务
移除遗留的 Xsession 脚本 97deepin-keyring-wb 并用新的 systemd 服务 dde-
keyring.service 替代。遗留脚本无条件启动 deepin-keyring-whitebox 客户
端,导致 xrdp 远程登录被阻塞。新服务包含对 XRDP_SESSION 环境变量的检查,
避免在远程会话中启动白盒客户端。
变更包括:
1. 从 Xsession 脚本列表中移除 97deepin-keyring-wb
2. 删除遗留脚本文件
3. 新增 dde-keyring.service systemd 单元
4. 配置服务在 dbus socket 后启动
5. 添加 XRDP_SESSION 检查以条件性启动白盒客户端
6. 将服务集成到 dde-session-pre.target
Log: 修复密钥服务阻塞 xrdp 远程登录的问题
Influence:
1. 测试正常桌面登录,确保密钥服务正确启动
2. 测试 xrdp 远程登录,验证白盒客户端未启动
3. 验证 gnome-keyring-daemon 在本地和远程会话中都能启动
4. 检查 systemd 服务状态和日志以确保正常运行
5. 测试会话关闭,确保服务正确终止1 parent 7a6866a commit 8d55bf8
File tree
4 files changed
+34
-9
lines changed- debian
- misc/Xsession.d
- systemd
4 files changed
+34
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 2 | + | |
| 3 | + | |
7 | 4 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
10 | 14 | | |
11 | 15 | | |
12 | 16 | | |
| |||
15 | 19 | | |
16 | 20 | | |
17 | 21 | | |
| 22 | + | |
18 | 23 | | |
19 | 24 | | |
20 | 25 | | |
| |||
26 | 31 | | |
27 | 32 | | |
28 | 33 | | |
| 34 | + | |
| 35 | + | |
29 | 36 | | |
30 | 37 | | |
31 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
0 commit comments