merge(chv-muse-round12): 合入 P7 状态与记忆分离 (29fa0c8)
冲突按并集解:build.sh 保留 P2+P3+P4 检查/拷入 + P7 的 chv-memory 检查/拷入(P7 的重复 runcmd 行删掉——同一文件 写两次会盖掉 authd 启动行);buildinfo.py 加 chv-memory 一项; production-readiness.md P7 一节顺延为 §18。P7 测试 46 项全过。
This commit is contained in:
commit
320cd36921
8 files changed
+1667
-1
No files matched your search
@@ -207,6 +207,11 @@ for p4_file in chv-cdp-broker.py chv_browser_guard.py browser-blocklist.txt; do
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
if [ ! -f "$SCRIPT_DIR/chv-memory.py" ]; then
|
||||
echo "缺少 chv-memory.py(客内记忆文件脚本):$SCRIPT_DIR" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$DRY_RUN" = "0" ]; then
|
||||
if [ ! -e /dev/kvm ]; then
|
||||
echo "CHV_GUEST_BUILD needs a KVM host: /dev/kvm 不存在" >&2
|
||||
@@ -316,6 +321,9 @@ VC_ARGS=(-a "$OUT/disk.raw"
|
||||
--copy-in "$SCRIPT_DIR/chv_browser_guard.py:/usr/local/bin/"
|
||||
--copy-in "$SCRIPT_DIR/browser-blocklist.txt:/usr/local/share/chv/"
|
||||
--run-command 'mv /usr/local/bin/chv-cdp-broker.py /usr/local/bin/chv-cdp-broker && chmod +x /usr/local/bin/chv-cdp-broker && chmod 0644 /usr/local/bin/chv_browser_guard.py /usr/local/share/chv/browser-blocklist.txt'
|
||||
--copy-in "$SCRIPT_DIR/chv-memory.py:/usr/local/bin/"
|
||||
--run-command 'mv /usr/local/bin/chv-memory.py /usr/local/bin/chv-memory && chmod +x /usr/local/bin/chv-memory'
|
||||
|
||||
--run-command 'git config --system user.name chv && git config --system user.email chv@localhost && git config --system credential.helper store && git config --system init.defaultBranch main'
|
||||
--run-command "$GT_INSTALL_CMD"
|
||||
--run-command '/usr/local/bin/gt version > /app/guest-versions-gt.txt'
|
||||
|
||||
Reference in new issue
Block a user