From 031d622a9a0c223350622e9b84bee6e1a1868e3b Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Mon, 27 Oct 2025 09:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=20=E5=A4=9A=E5=B1=82=20dir?=
 =?UTF-8?q?=20base?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/usr/bin/apm | 55 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/usr/bin/apm b/src/usr/bin/apm
index be68549..9b68776 100755
--- a/src/usr/bin/apm
+++ b/src/usr/bin/apm
@@ -38,15 +38,57 @@ Commands:
 EOF
 }
 
+
 apm_exec(){
-mkdir -p /tmp/apm/${coredir}
-fuse-overlayfs -o lowerdir="${PATH_PREFIX}/var/lib/apm/${basedir}/files/ace-env",upperdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/core/",workdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/work/" "/tmp/apm/${coredir}"
-
-chrootEnvPath=/tmp/apm/${coredir} /var/lib/apm/apm/files/ace-run "$@"
-umount /tmp/apm/${coredir}
-
+    # 读取info文件中的所有行，按从下到上的顺序构建lowerdir
+    local lowerdirs=()
+    
+    # 检查info文件是否存在
+    if [[ ! -f "${PATH_PREFIX}/var/lib/apm/${coredir}/info" ]]; then
+        log.error "Info file not found for package: $coredir"
+        return 1
+    fi
+    
+    # 读取info文件的每一行
+    while IFS= read -r basedir; do
+        [[ -z "$basedir" ]] && continue  # 跳过空行
+        
+        # 检查ace-env目录是否存在
+        if [[ -d "${PATH_PREFIX}/var/lib/apm/${basedir}/files/ace-env" ]]; then
+            lowerdirs+=("${PATH_PREFIX}/var/lib/apm/${basedir}/files/ace-env")
+        # 如果ace-env不存在，检查core目录
+        elif [[ -d "${PATH_PREFIX}/var/lib/apm/${basedir}/files/core" ]]; then
+            lowerdirs+=("${PATH_PREFIX}/var/lib/apm/${basedir}/files/core")
+        else
+            log.warn "Neither ace-env nor core directory found for base: $basedir"
+        fi
+    done < "${PATH_PREFIX}/var/lib/apm/${coredir}/info"
+    
+    # 检查是否找到了有效的lowerdir
+    if [[ ${#lowerdirs[@]} -eq 0 ]]; then
+        log.error "No valid lower directories found for package: $coredir"
+        return 1
+    fi
+    
+    # 将lowerdirs数组用冒号连接起来
+    local lowerdir=$(IFS=:; echo "${lowerdirs[*]}")
+    
+    # 创建挂载点目录
+    mkdir -p "/tmp/apm/${coredir}"
+    
+    # 使用fuse-overlayfs挂载
+    log.debug "Mounting with lowerdir: $lowerdir"
+    fuse-overlayfs -o lowerdir="$lowerdir",upperdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/core/",workdir="${PATH_PREFIX}/var/lib/apm/${coredir}/files/work/" "/tmp/apm/${coredir}"
+    
+    # 执行命令
+    chrootEnvPath="/tmp/apm/${coredir}" /var/lib/apm/apm/files/ace-run "$@"
+    
+    # 卸载
+    umount "/tmp/apm/${coredir}"
 }
 
+
+
 # 调试信息函数
 debug_info() {
     log.debug "======= APM Debug Information ======="
@@ -222,7 +264,6 @@ case "$1" in
         fi
         
         coredir=$pkg
-        basedir=$(cat ${PATH_PREFIX}/var/lib/apm/${coredir}/info)
 
 
         # 检测是否有额外命令参数