⛄ Sync 2026-03-31 23:53:13

luci-app-openclaw/root/etc/config/openclaw

@@ -4,3 +4,4 @@ config openclaw 'main'
 	option bind 'lan'
 	option token ''
 	option pty_port '18793'
+	option install_path '/opt'

luci-app-openclaw/root/etc/init.d/openclaw

@@ -10,14 +10,21 @@ EXTRA_HELP="    setup            下载 Node.js 并安装 OpenClaw
         status_service   显示服务状态
         restart_gateway  仅重启 Gateway 实例 (不影响 Web PTY)"
 
-NODE_BASE="/opt/openclaw/node"
-OC_GLOBAL="/opt/openclaw/global"
-OC_DATA="/opt/openclaw/data"
+# ── 安装路径 (支持自定义) ──
+# 从 UCI 配置读取自定义路径，默认为 /opt
+# 程序会在此路径下自动创建 openclaw 目录
+OC_BASE_PATH="$(uci -q get openclaw.main.install_path || echo '/opt')"
+OC_INSTALL_PATH="${OC_BASE_PATH}/openclaw"
+NODE_BASE="${OC_INSTALL_PATH}/node"
+OC_GLOBAL="${OC_INSTALL_PATH}/global"
+OC_DATA="${OC_INSTALL_PATH}/data"
 
 # ── OverlayFS 兼容性修复 ──
 # Docker bind mount (/overlay/upper/opt/docker) 会导致 /opt 不可写
 # 解决: bind mount upper 层的 /opt 到合并视图的 /opt
+# 注意: 仅当基础路径为 /opt 时才需要此修复
 _oc_fix_opt() {
+	[ "$OC_BASE_PATH" != "/opt" ] && return 0
 	mkdir -p /opt/openclaw/.probe 2>/dev/null && { rmdir /opt/openclaw/.probe 2>/dev/null; return 0; }
 	if [ -d /overlay/upper/opt ]; then
 		mkdir -p /overlay/upper/opt/openclaw 2>/dev/null

luci-app-openclaw/root/etc/profile.d/openclaw.sh

@@ -2,12 +2,17 @@
 # ============================================================================
 # luci-app-openclaw — 全局环境变量
 # 仅在 Node.js 已安装时生效，为 SSH 登录用户提供正确的运行环境
-# 解决 Issue #42: 统一配置文件路径，避免 /root/.openclaw 与 /opt/openclaw/data/.openclaw 混乱
+# 解决 Issue #42: 统一配置文件路径，避免 /root/.openclaw 与安装路径混乱
+# 支持自定义安装路径
 # ============================================================================
 
-NODE_BASE="/opt/openclaw/node"
-OC_GLOBAL="/opt/openclaw/global"
-OC_DATA="/opt/openclaw/data"
+# 从 UCI 配置读取自定义安装路径
+# 用户配置的是基础路径，程序会在此路径下创建 openclaw 目录
+OC_BASE_PATH="$(uci -q get openclaw.main.install_path 2>/dev/null || echo '/opt')"
+OC_INSTALL_PATH="${OC_BASE_PATH}/openclaw"
+NODE_BASE="${OC_INSTALL_PATH}/node"
+OC_GLOBAL="${OC_INSTALL_PATH}/global"
+OC_DATA="${OC_INSTALL_PATH}/data"
 
 # 检查 Node.js 是否已安装
 [ -x "${NODE_BASE}/bin/node" ] || return 0

luci-app-openclaw/root/etc/uci-defaults/99-openclaw

@@ -1,11 +1,16 @@
 #!/bin/sh
 # luci-app-openclaw — 首次安装/升级初始化脚本
 
+# 获取安装路径 (支持自定义)
+# 用户配置的是基础路径，程序会在此路径下创建 openclaw 目录
+OC_BASE_PATH="$(uci -q get openclaw.main.install_path || echo '/opt')"
+OC_INSTALL_PATH="${OC_BASE_PATH}/openclaw"
+
 # ── v1.0.16: 清理错误路径下的配置文件 (Issue #42) ──
 # 用户在 SSH 中直接运行 openclaw 命令时，可能创建了 /root/.openclaw/ 目录
 # 需要迁移数据并清理，避免路径混乱
 if [ -d "/root/.openclaw" ]; then
-	OC_DATA="/opt/openclaw/data"
+	OC_DATA="${OC_INSTALL_PATH}/data"
 	# 迁移 skills 目录 (如果存在且目标不存在)
 	if [ -d "/root/.openclaw/skills" ] && [ ! -d "${OC_DATA}/.openclaw/skills" ]; then
 		mkdir -p "${OC_DATA}/.openclaw"
@@ -41,7 +46,7 @@ if ! id openclaw >/dev/null 2>&1; then
 	done
 	# OpenWrt 方式：直接写入 /etc/passwd 和 /etc/shadow
 	if ! grep -q '^openclaw:' /etc/passwd 2>/dev/null; then
-		echo "openclaw:x:${OC_UID}:${OC_GID}:openclaw:/opt/openclaw/data:/bin/false" >> /etc/passwd
+		echo "openclaw:x:${OC_UID}:${OC_GID}:openclaw:${OC_INSTALL_PATH}/data:/bin/false" >> /etc/passwd
 	fi
 	if ! grep -q '^openclaw:' /etc/shadow 2>/dev/null; then
 		echo 'openclaw:x:0:0:99999:7:::' >> /etc/shadow
@@ -52,20 +57,22 @@ if ! id openclaw >/dev/null 2>&1; then
 fi
 
 # 创建数据目录
-# ── OverlayFS 兼容: Docker bind mount 可能导致 /opt 不可写 ──
-if ! mkdir -p /opt/openclaw/.probe 2>/dev/null; then
-	if [ -d /overlay/upper/opt ]; then
-		mkdir -p /overlay/upper/opt/openclaw 2>/dev/null
-		mount --bind /overlay/upper/opt /opt 2>/dev/null
+# ── OverlayFS 兼容: Docker bind mount 可能导致 /opt 不可写 (仅当基础路径为 /opt 时) ──
+if [ "$OC_BASE_PATH" = "/opt" ]; then
+	if ! mkdir -p /opt/openclaw/.probe 2>/dev/null; then
+		if [ -d /overlay/upper/opt ]; then
+			mkdir -p /overlay/upper/opt/openclaw 2>/dev/null
+			mount --bind /overlay/upper/opt /opt 2>/dev/null
+		fi
+		rmdir /opt/openclaw/.probe 2>/dev/null
+	else
+		rmdir /opt/openclaw/.probe 2>/dev/null
 	fi
-	rmdir /opt/openclaw/.probe 2>/dev/null
-else
-	rmdir /opt/openclaw/.probe 2>/dev/null
 fi
-mkdir -p /opt/openclaw/data/.openclaw
-mkdir -p /opt/openclaw/node
-mkdir -p /opt/openclaw/global
-chown -R openclaw:openclaw /opt/openclaw 2>/dev/null || true
+mkdir -p "${OC_INSTALL_PATH}/data/.openclaw"
+mkdir -p "${OC_INSTALL_PATH}/node"
+mkdir -p "${OC_INSTALL_PATH}/global"
+chown -R openclaw:openclaw "${OC_INSTALL_PATH}" 2>/dev/null || true
 
 # 生成随机 Token (如果尚未设置)
 CURRENT_TOKEN=$(uci -q get openclaw.main.token)