Skip to content

Commit 076e63a

Browse files
committed
fix: change gnome-keyring-daemon startup order
Changed the startup sequence to launch gnome-keyring-daemon before deepin-keyring-whitebox. This prevents potential issues where the keyring's pkcs11 module might not be fully loaded when attempting to unlock, ensuring proper initialization of all keyring components. Influence: 1. Test system startup and login process 2. Verify keyring functionality works correctly 3. Check that pkcs11 module is properly loaded 4. Test application access to keyring services 5. Verify no race conditions during session initialization fix: 调整 gnome-keyring-daemon 启动顺序 修改启动顺序,先启动 gnome-keyring-daemon 再启动 deepin-keyring- whitebox。这可以防止在尝试解锁时 keyring 的 pkcs11 模块可能尚未完全加载 的问题,确保所有 keyring 组件正确初始化。 PMS: BUG-350091 Influence: 1. 测试系统启动和登录过程 2. 验证 keyring 功能正常工作 3. 检查 pkcs11 模块是否正确加载 4. 测试应用程序对 keyring 服务的访问 5. 验证会话初始化期间没有竞态条件
1 parent 95d4648 commit 076e63a

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/sh
22
# Start deepin-keyring-whitebox and gnome-keyring-daemon for DDE session
3+
if [ -x /usr/bin/gnome-keyring-daemon ]; then
4+
echo "start gnome-keyring-daemon with components secrets,pkcs11,ssh"
5+
/usr/bin/gnome-keyring-daemon --start --components=secrets,pkcs11,ssh || true
6+
fi
37

48
if [ -x /usr/bin/deepin-keyring-whitebox ]; then
59
echo "start deepin-keyring-whitebox client"
610
/usr/bin/deepin-keyring-whitebox --opt-client=waitfifonotify || true
7-
fi
8-
9-
if [ -x /usr/bin/gnome-keyring-daemon ]; then
10-
echo "start gnome-keyring-daemon with components secrets,pkcs11,ssh"
11-
/usr/bin/gnome-keyring-daemon --start --components=secrets,pkcs11,ssh || true
12-
fi
11+
fi

0 commit comments

Comments
 (0)