补齐原生CI的merged-usr预检

按运行时代码动态复现 merged-usr 符号链接避免 bubblewrap canary 因动态加载器路径误报失败
2026-07-21 22:03:01 +08:00
parent 5d045d532f
commit 94ee363d84
1 changed files with 23 additions and 12 deletions
@@ -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