From 94ee363d84797b0ed118fc1ac11e2d1e107da5d5 Mon Sep 17 00:00:00 2001
From: kdletters <kdletters@qq.com>
Date: Tue, 21 Jul 2026 22:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E5=8E=9F=E7=94=9FCI=E7=9A=84?=
 =?UTF-8?q?merged-usr=E9=A2=84=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

按运行时代码动态复现 merged-usr 符号链接
避免 bubblewrap canary 因动态加载器路径误报失败
---
 .gitea/workflows/project-ci.yml | 35 ++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/project-ci.yml b/.gitea/workflows/project-ci.yml
index e36490c9a..11c6f8543 100644
--- a/.gitea/workflows/project-ci.yml
+++ b/.gitea/workflows/project-ci.yml
@@ -326,18 +326,29 @@ jobs:
             patchelf \
             pkg-config \
             wget
-          bwrap --die-with-parent \
-            --unshare-all \
-            --unshare-user \
-            --disable-userns \
-            --assert-userns-disabled \
-            --cap-drop ALL \
-            --clearenv \
-            --ro-bind /usr /usr \
-            --proc /proc \
-            --dev /dev \
-            --tmpfs /tmp \
-            -- /usr/bin/true
+          bwrap_args=(
+            --die-with-parent
+            --unshare-all
+            --unshare-user
+            --disable-userns
+            --assert-userns-disabled
+            --cap-drop ALL
+            --clearenv
+            --ro-bind /usr /usr
+          )
+          for merged_path in /bin /sbin /lib /lib64; do
+            if [[ -L "${merged_path}" ]]; then
+              bwrap_args+=(--symlink "$(readlink "${merged_path}")" "${merged_path}")
+            fi
+          done
+          bwrap_args+=(
+            --proc /proc
+            --dev /dev
+            --tmpfs /tmp
+            --
+            /usr/bin/true
+          )
+          bwrap "${bwrap_args[@]}"
 
       - name: Set up Node.js 22
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4