From 11eb256a568260cbf8ac203718c3a9bd9c9c144b Mon Sep 17 00:00:00 2001
From: fuleyi <fuleyi@uniontech.com>
Date: Fri, 6 Feb 2026 15:27:33 +0800
Subject: [PATCH] fix: change gnome-keyring-daemon startup order
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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. 验证会话初始化期间没有竞态条件
---
 misc/Xsession.d/97deepin-keyring-wb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/misc/Xsession.d/97deepin-keyring-wb b/misc/Xsession.d/97deepin-keyring-wb
index 22f008f..1ac4324 100644
--- a/misc/Xsession.d/97deepin-keyring-wb
+++ b/misc/Xsession.d/97deepin-keyring-wb
@@ -1,12 +1,11 @@
 #!/bin/sh
 # Start deepin-keyring-whitebox and gnome-keyring-daemon for DDE session
+if [ -x /usr/bin/gnome-keyring-daemon ]; then
+    echo "start gnome-keyring-daemon with components secrets,pkcs11,ssh"
+    /usr/bin/gnome-keyring-daemon --start --components=secrets,pkcs11,ssh || true
+fi 
 
 if [ -x /usr/bin/deepin-keyring-whitebox ]; then
     echo "start deepin-keyring-whitebox client"
     /usr/bin/deepin-keyring-whitebox --opt-client=waitfifonotify || true
-fi
-
-if [ -x /usr/bin/gnome-keyring-daemon ]; then
-    echo "start gnome-keyring-daemon with components secrets,pkcs11,ssh"
-    /usr/bin/gnome-keyring-daemon --start --components=secrets,pkcs11,ssh || true
-fi 
\ No newline at end of file
+fi
\ No newline at end of file