Author SHA1 Message Date
Floweynt ead537aef9 suppress mail errors
diff-pr / dix (pull_request) Successful in 6m32s
flake-check / flake-check (pull_request) Successful in 3m50s
lint / lint (pull_request) Successful in 1m49s
2026-09-13 20:32:26 -05:00
Floweynt 5f729053b2 suppress mail errors
diff-pr / dix (pull_request) Successful in 6m34s
flake-check / flake-check (pull_request) Failing after 3m17s
lint / lint (pull_request) Successful in 1m50s
2026-09-13 20:14:24 -05:00
Floweynt 84d4aa734a suppress mail errors
diff-pr / dix (pull_request) Successful in 6m30s
flake-check / flake-check (pull_request) Failing after 3m28s
lint / lint (pull_request) Successful in 1m46s
2026-09-13 20:00:39 -05:00
Floweynt d288689de3 fix failing passes
diff-pr / dix (pull_request) Successful in 6m42s
lint / lint (pull_request) Successful in 1m48s
flake-check / flake-check (pull_request) Failing after 3m21s
2026-09-13 14:33:29 -05:00
Floweynt 5888038c32 improve 2026-09-13 14:33:29 -05:00
Floweynt f1eb050ed6 format 2026-09-13 14:33:29 -05:00
Floweynt 6089103cba meow 2026-09-13 14:33:29 -05:00
2 changed files with 8 additions and 33 deletions
+8 -14
View File
@@ -222,15 +222,13 @@ rec {
: Bind mounts, keyed by mount point. : Bind mounts, keyed by mount point.
`resources.devices` `resources.devices`
: Host device nodes to expose, as paths. Bound into the container at the : Host device nodes to expose, as paths, added to the unit's
same path and added to the unit's `DeviceAllow=` - the cgroup `DeviceAllow=`. nspawn populates a handful of privileged devices
permission alone doesn't get you a working node (nothing can `mknod` a (`/dev/kvm`, `/dev/net/tun`, ...) into the container's own `/dev` once
device inside a user namespace), and the bind alone leaves the cgroup the cgroup allows it, and silently skips ones the host doesn't have -
denying `open()`, so both are needed. The bind is unconditional, so no `resources.fs` bind mount needed. Nodes keep their host ownership,
the device must actually exist on whatever host runs the container. so a consumer inside needs `isolation.privateUsers = "identity"` for
Nodes keep their host ownership, so a consumer inside needs the owning gid to mean anything.
`isolation.privateUsers = "identity"` for the owning gid to mean
anything.
`isolation.nixDaemon` `isolation.nixDaemon`
: Whether the Nix daemon and CLI are available inside the container. : Whether the Nix daemon and CLI are available inside the container.
@@ -297,10 +295,6 @@ rec {
+ lib.optionalString useIdmap ":idmap" + lib.optionalString useIdmap ":idmap"
) allBindMounts; ) allBindMounts;
bindMountHostPaths = map (bm: bm.hostPath) (lib.attrValues allBindMounts); bindMountHostPaths = map (bm: bm.hostPath) (lib.attrValues allBindMounts);
# DeviceAllow= alone only grants cgroup permission - nspawn can't
# mknod a device node inside a user namespace, so the node still
# needs an explicit bind from the host.
deviceFlags = map (d: "--bind=${d}") devices;
inherit (deriveIdentity ifPrefix.nspawn name) inherit (deriveIdentity ifPrefix.nspawn name)
iface iface
mac mac
@@ -387,7 +381,7 @@ rec {
nixosContainer = { nixosContainer = {
inherit autoStart privateUsers; inherit autoStart privateUsers;
bindMounts = { }; bindMounts = { };
extraFlags = bindMountExtraFlags ++ deviceFlags; extraFlags = bindMountExtraFlags;
privateNetwork = true; privateNetwork = true;
extraVeths = linkVeths; extraVeths = linkVeths;
config = config =
-19
View File
@@ -336,28 +336,9 @@ with subtest("(functional): published ports follow the container's lifetime"):
with subtest("(functional): declared devices are usable in-container"): with subtest("(functional): declared devices are usable in-container"):
for name, devices in DEVICES.items(): for name, devices in DEVICES.items():
for dev in devices: for dev in devices:
# opened, not stat'd: without DeviceAllow= the node is still visible
server.succeed(ct_cmd(name, f"exec 3<> {dev}")) server.succeed(ct_cmd(name, f"exec 3<> {dev}"))
with subtest("(functional): /dev/kvm actually initializes, not just opens"):
# a wrong-gid or unmapped node still opens but fails the ioctls qemu
# needs, so boot with no disk (never completes) and kill it - the
# failure mode this catches is qemu refusing to start at all.
for name, devices in DEVICES.items():
if "/dev/kvm" not in devices:
continue
out = server.succeed(
ct_cmd(
name,
f"{TIMEOUT} 3 qemu-system-x86_64 -enable-kvm -m 256 -nographic -no-reboot "
">/tmp/qemu.out 2>&1; cat /tmp/qemu.out",
)
)
assert "Permission denied" not in out, f"{name}: qemu couldn't use /dev/kvm:\n{out}"
assert "Could not access KVM" not in out, f"{name}: qemu couldn't use /dev/kvm:\n{out}"
with subtest("(isolation): devices reach only the container that declared them"): with subtest("(isolation): devices reach only the container that declared them"):
for name in enterable: for name in enterable:
for dev in {d for ds in DEVICES.values() for d in ds} - set(DEVICES.get(name, [])): for dev in {d for ds in DEVICES.values() for d in ds} - set(DEVICES.get(name, [])):