containerization #3

Merged
flowey merged 3 commits from frcc-kvm into master 2026-09-12 06:40:12 +00:00
Member
No description provided.
@@ -326,0 +347,4 @@
for name in (n for n, ds in DEVICES.items() if ds):
host_ns = server.succeed("readlink /proc/1/ns/user").strip()
ct_ns = server.succeed(f"readlink /proc/{container_pid(name)}/ns/user").strip()
assert host_ns != ct_ns, f"{name} shares the host user namespace"
Owner

do asserts even trigger in python scripts by default? not confident this is the right mechanism

do asserts even trigger in python scripts by default? not confident this is the right mechanism

["example","server-n0"]
/nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964
/nix/store/r49hifxa4385z2mc9lja51wqb92mr798-nixos-system-server-n0-26.11.20260810.2fcb964
["example","server-n0"]
/nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964
/nix/store/k6mfj88i62npmx2kh4w7zlcs3187qw06-nixos-system-server-n0-26.11.20260810.2fcb964

System closure diff vs master

example

<<< /nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964
>>> /nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964

PATHS: 816 -> 816 (+0, -0)
SIZE: 3.29 GiB -> 3.29 GiB
DIFF: 0 bytes

server-n0

<<< /nix/store/r49hifxa4385z2mc9lja51wqb92mr798-nixos-system-server-n0-26.11.20260810.2fcb964
>>> /nix/store/k6mfj88i62npmx2kh4w7zlcs3187qw06-nixos-system-server-n0-26.11.20260810.2fcb964

PATHS: 2308 -> 2308 (+16, -16)
SIZE: 10.6 GiB -> 10.6 GiB
DIFF: -128 bytes

["example","server-n0"]
/nix/store/xqjyw5hlcl26mrgpfd0n75ps16j37iaf-inspect-example.json
/nix/store/mnh8wz8xzrwajg89smc686g36yl5sa0m-inspect-server-n0.json
["example","server-n0"]
/nix/store/xqjyw5hlcl26mrgpfd0n75ps16j37iaf-inspect-example.json
/nix/store/iqqjkvzi5f7xnar9kgby0b8a9sfsz6xm-inspect-server-n0.json

Inspection diff vs master

server-n0

@@ deployments @@
- ssh-generic.limits.privateUsers: pick
+ ssh-generic.limits.privateUsers: identity
@@ units @@
  @host.container@ssh-generic.service.script:
@@ -119,7 +119,7 @@
   --setenv HOST_PORT="${HOST_PORT-}" \
   --setenv PATH="$PATH" \
    \
-  --capability="CAP_NET_ADMIN,CAP_MKNOD" \
+   \
    \
   ${EXTRA_NSPAWN_FLAGS-} \
   container-init "${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"
- @host.container@ssh-generic.service.serviceConfig.DeviceAllow:
-   - /dev/vhost-net rw
- @host.container@ssh-generic.service.serviceConfig.DeviceAllow:
-   - /dev/net/tun rwm
- @host.container@ssh-generic.service.serviceConfig.DeviceAllow:
-   - /dev/net/tun rwm
+ @host.microvm@ci-runner.service.serviceConfig.DeviceAllow: []
<!-- dix-diff --> ["example","server-n0"] /nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964 /nix/store/r49hifxa4385z2mc9lja51wqb92mr798-nixos-system-server-n0-26.11.20260810.2fcb964 ["example","server-n0"] /nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964 /nix/store/k6mfj88i62npmx2kh4w7zlcs3187qw06-nixos-system-server-n0-26.11.20260810.2fcb964 ### System closure diff vs `master` ## example ``` <<< /nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964 >>> /nix/store/prahsm2071cyy2ldx86qagz3s37prqzd-nixos-system-example-26.11.20260810.2fcb964 PATHS: 816 -> 816 (+0, -0) SIZE: 3.29 GiB -> 3.29 GiB DIFF: 0 bytes ``` ## server-n0 ``` <<< /nix/store/r49hifxa4385z2mc9lja51wqb92mr798-nixos-system-server-n0-26.11.20260810.2fcb964 >>> /nix/store/k6mfj88i62npmx2kh4w7zlcs3187qw06-nixos-system-server-n0-26.11.20260810.2fcb964 PATHS: 2308 -> 2308 (+16, -16) SIZE: 10.6 GiB -> 10.6 GiB DIFF: -128 bytes ``` ["example","server-n0"] /nix/store/xqjyw5hlcl26mrgpfd0n75ps16j37iaf-inspect-example.json /nix/store/mnh8wz8xzrwajg89smc686g36yl5sa0m-inspect-server-n0.json ["example","server-n0"] /nix/store/xqjyw5hlcl26mrgpfd0n75ps16j37iaf-inspect-example.json /nix/store/iqqjkvzi5f7xnar9kgby0b8a9sfsz6xm-inspect-server-n0.json ### Inspection diff vs `master` ## server-n0 ```diff @@ deployments @@ - ssh-generic.limits.privateUsers: pick + ssh-generic.limits.privateUsers: identity @@ units @@ @host.container@ssh-generic.service.script: @@ -119,7 +119,7 @@ --setenv HOST_PORT="${HOST_PORT-}" \ --setenv PATH="$PATH" \ \ - --capability="CAP_NET_ADMIN,CAP_MKNOD" \ + \ \ ${EXTRA_NSPAWN_FLAGS-} \ container-init "${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" - @host.container@ssh-generic.service.serviceConfig.DeviceAllow: - - /dev/vhost-net rw - @host.container@ssh-generic.service.serviceConfig.DeviceAllow: - - /dev/net/tun rwm - @host.container@ssh-generic.service.serviceConfig.DeviceAllow: - - /dev/net/tun rwm + @host.microvm@ci-runner.service.serviceConfig.DeviceAllow: [] ```
flowey force-pushed frcc-kvm from 9721112d67 to 1bf51e9a9e 2026-09-11 20:27:38 +00:00 Compare
autumn force-pushed frcc-kvm from 49137f9c16 to 5ef48168f4 2026-09-11 21:00:00 +00:00 Compare
autumn added 2 commits 2026-09-11 21:17:26 +00:00
fix bug
diff-pr / dix (pull_request) Successful in 6m20s
flake-check / flake-check (pull_request) Failing after 2m42s
lint / lint (pull_request) Successful in 1m46s
70d7eafe76
autumn force-pushed frcc-kvm from 5ef48168f4 to 70d7eafe76 2026-09-11 21:17:26 +00:00 Compare
flowey added 1 commit 2026-09-12 06:19:26 +00:00
try fixing again
diff-pr / dix (pull_request) Successful in 6m41s
flake-check / flake-check (pull_request) Successful in 4m32s
lint / lint (pull_request) Successful in 1m51s
1862e7660e
flowey merged commit 8190b0080d into master 2026-09-12 06:40:12 +00:00
Sign in to join this conversation.
No Reviewers
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: server/server-config#3