fix(smolmachines): mount git-gate files at boot via virtiofs staging dirs
Two issues caused krun_start_enter -22 (VM boot crash): 1. git-gate entrypoint missing at boot: sidecar_init.py starts all daemons (including git-gate) immediately as PID 1. The entrypoint was copied in via machine_cp which only runs after machine_start returns — too late. virtiofs also can't mount files at root (/). Fix: bake a static /git-gate-entrypoint.sh wrapper into the Dockerfile.sidecars image that delegates to /etc/git-gate/entrypoint.sh. For smolmachines, stage per-bottle scripts with correct in-VM names under the git-gate state dir and virtiofs-mount to /etc/git-gate/ at VM creation time. docker/macOS backends are unchanged (their file bind-mount/docker cp still overrides the static wrapper). 2. Egress confdir mounted read-only: egress_entrypoint.sh writes combined-trust.pem to confdir under set -e; mitmproxy also needs to write its per-host cert cache there. Both fail fatally on a read-only virtiofs mount. Fix: change the egress confdir virtiofs mount to writable. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -404,7 +404,11 @@ class TestBundleLaunchSpec(unittest.TestCase):
|
||||
),
|
||||
)
|
||||
|
||||
spec = _bundle_launch_spec(plan, "net", "127.0.0.16")
|
||||
with patch(
|
||||
"bot_bottle.backend.smolmachines.launch._stage_git_gate_for_smolvm",
|
||||
return_value=(Path("/tmp/smolvm-scripts"), Path("/tmp/smolvm-creds")),
|
||||
):
|
||||
spec = _bundle_launch_spec(plan, "net", "127.0.0.16")
|
||||
|
||||
self.assertEqual(
|
||||
"egress,git-gate,git-http",
|
||||
@@ -430,7 +434,9 @@ class TestBundleLaunchSpec(unittest.TestCase):
|
||||
spec = _bundle_launch_spec(plan, "net", "127.0.0.16")
|
||||
self.assertIn("supervise", spec.daemons_csv)
|
||||
self.assertIn(f"SUPERVISE_DB_PATH={DB_PATH_IN_CONTAINER}", spec.environment)
|
||||
self.assertIn(("/tmp/bot-bottle.db", DB_PATH_IN_CONTAINER, False), spec.volumes)
|
||||
# virtiofs requires directory mounts; the DB's parent dir is
|
||||
# mounted so bot-bottle.db lands at the right in-VM path.
|
||||
self.assertIn(("/tmp", str(Path(DB_PATH_IN_CONTAINER).parent), False), spec.volumes)
|
||||
|
||||
def test_canary_env_visible_to_smolvm_guest(self):
|
||||
plan = _plan(canary=True)
|
||||
@@ -556,6 +562,9 @@ class TestLaunchResourceWiring(unittest.TestCase):
|
||||
"bot_bottle.backend.smolmachines.launch._bundle.start_bundle_vm",
|
||||
return_value=raw_launch,
|
||||
) as start_vm, patch(
|
||||
"bot_bottle.backend.smolmachines.launch._stage_git_gate_for_smolvm",
|
||||
return_value=(Path("/tmp/smolvm-scripts"), Path("/tmp/smolvm-creds")),
|
||||
), patch(
|
||||
"bot_bottle.backend.smolmachines.launch._forward.start_forwarder",
|
||||
return_value=handle,
|
||||
) as start_forwarder:
|
||||
|
||||
Reference in New Issue
Block a user