Commit 9ef372e
committed
fix: prevent whitebox keyring from blocking xrdp remote login
The original script directly started both gnome-keyring-daemon and
deepin-keyring-whitebox during X session initialization, which caused
issues with xrdp remote login sessions. The deepin-keyring-whitebox
service was blocking xrdp connections.
This change replaces the direct script execution with a systemd user
service (dde-keyring.service) that includes conditional logic to skip
deepin-keyring-whitebox startup when XRDP_SESSION environment variable
is detected. The service properly handles both keyring components with
appropriate dependencies and timeouts.
Key changes:
1. Removed direct keyring startup from Xsession script
2. Added new systemd user service for keyring management
3. Added XRDP_SESSION environment check to skip whitebox in remote
sessions
4. Maintained gnome-keyring functionality for all session types
5. Set proper service dependencies and timeout handling
Log: Fixed xrdp remote login issue caused by deepin-keyring-whitebox
service
Influence:
1. Test local desktop login to ensure keyring services start normally
2. Test xrdp remote login to verify whitebox service is properly skipped
3. Verify gnome-keyring-daemon starts in both local and remote sessions
4. Check that password management and SSH key functionality work
correctly
5. Test session startup time and service dependencies
fix: 解决白盒密钥服务阻塞xrdp远程登录的问题
原脚本在X会话初始化时直接启动gnome-keyring-daemon和deepin-keyring-
whitebox,这导致xrdp远程登录会话出现问题。deepin-keyring-whitebox服务会
阻塞xrdp连接。
此次更改将直接脚本执行替换为systemd用户服务(dde-keyring.service),该服务
包含条件逻辑,在检测到XRDP_SESSION环境变量时跳过deepin-keyring-whitebox
启动。该服务通过适当的依赖关系和超时设置来正确处理两个密钥环组件。
主要变更:
1. 从Xsession脚本中移除直接启动密钥环的代码
2. 新增systemd用户服务用于密钥环管理
3. 添加XRDP_SESSION环境检查以在远程会话中跳过白盒服务
4. 为所有会话类型保持gnome-keyring功能正常
5. 设置正确的服务依赖关系和超时处理
Log: 修复deepin-keyring-whitebox服务导致的xrdp远程登录问题
Influence:
1. 测试本地桌面登录,确保密钥环服务正常启动
2. 测试xrdp远程登录,验证白盒服务被正确跳过
3. 验证gnome-keyring-daemon在本地和远程会话中都能启动
4. 检查密码管理和SSH密钥功能正常工作
5. 测试会话启动时间和服务依赖关系1 parent 7a6866a commit 9ef372e
File tree
3 files changed
+33
-9
lines changed- misc/Xsession.d
- systemd
3 files changed
+33
-9
lines changed| 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