round-12: merge round-11 head 717efc4 (V-9 real-machine fixes)
Round-11 moved on Gitea after round-12 branched (29d3a5a->717efc4): V-9 guest-env fixes must be in any image built from this branch, or the round-12 image would ship the known defects V-9 found (guest-env never created when owner=chv:chv; wake reporting ready ~30s before the runcmd chown lands). Contents, all from717efc4: - build.sh: runcmd chowns /etc/chv/guest-env to chv:chv after 'start chv-authd', before 'chv-sync boot' - check/generate_lockfile.py: DECLARED_SOURCES gains P2 trio (chv-cell/broker/browser -> repo_commit) - executor._wait_guest_env_usable: with secrets delivered, wait for guest-env readable by the SSH user before reporting ready; timeout stops the VM and raises guest_env_not_ready; called from _boot_vm - hostkeys.py: V-9 root-cause comment (owner always root:root) - test_chv_gitea_sync.py: 5 new tests Conflict: build.sh runcmd line only. Resolved as union: 717efc4's runcmd line (with chown) kept; HEAD's P4 trio + P7 chv-memory copy-in lines (absent on the717efc4side) kept. executor.py merged cleanly.
This commit is contained in:
commit
5d5041bb7c
6 files changed
+165
-6
No files matched your search
+1
-1
@@ -316,7 +316,7 @@ VC_ARGS=(-a "$OUT/disk.raw"
|
||||
--copy-in "$SCRIPT_DIR/chv-authd.service:/etc/systemd/system/"
|
||||
--run-command 'mv /usr/local/bin/authd.py /usr/local/bin/chv-authd && chmod +x /usr/local/bin/chv-authd /usr/local/bin/git-credential-chv-authd'
|
||||
--run-command 'systemctl enable chv-authd || true'
|
||||
--run-command 'printf "runcmd:\n - systemctl restart ssh || service ssh restart || true\n - systemctl start chv-authd || true\n - /usr/local/bin/chv-sync boot >>/var/log/chv-sync.log 2>&1 || true\n" > /etc/cloud/cloud.cfg.d/99-chv-sync.cfg'
|
||||
--run-command 'printf "runcmd:\n - systemctl restart ssh || service ssh restart || true\n - systemctl start chv-authd || true\n - test -f /etc/chv/guest-env && chown chv:chv /etc/chv/guest-env || true\n - /usr/local/bin/chv-sync boot >>/var/log/chv-sync.log 2>&1 || true\n" > /etc/cloud/cloud.cfg.d/99-chv-sync.cfg'
|
||||
--copy-in "$SCRIPT_DIR/chv-cdp-broker.py:/usr/local/bin/"
|
||||
--copy-in "$SCRIPT_DIR/chv_browser_guard.py:/usr/local/bin/"
|
||||
--copy-in "$SCRIPT_DIR/browser-blocklist.txt:/usr/local/share/chv/"
|
||||
|
||||
Reference in new issue
Block a user