Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
49137f9c16 | ||
|
|
6cda214d97 | ||
|
|
9721112d67 | ||
|
|
3605fc36ef | ||
|
|
bb79660386 | ||
|
|
a54cbc14bd | ||
|
|
06ed76e5ab | ||
|
|
096908ac39 | ||
|
|
33ccab9ad4 |
@@ -222,11 +222,13 @@ rec {
|
||||
: Bind mounts, keyed by mount point.
|
||||
|
||||
`resources.devices`
|
||||
: Host device nodes to expose, as paths. Bound into the container's `/dev`
|
||||
and added to the unit's `DeviceAllow=` - the bind alone leaves the cgroup
|
||||
denying `open()`. Nodes keep their host ownership, so a consumer inside
|
||||
needs `isolation.privateUsers = "identity"` for the owning gid to mean
|
||||
anything.
|
||||
: Host device nodes to expose, as paths, added to the unit's
|
||||
`DeviceAllow=`. nspawn populates a handful of privileged devices
|
||||
(`/dev/kvm`, `/dev/net/tun`, ...) into the container's own `/dev` once
|
||||
the cgroup allows it, and silently skips ones the host doesn't have -
|
||||
no `resources.fs` bind mount needed. Nodes keep their host ownership,
|
||||
so a consumer inside needs `isolation.privateUsers = "identity"` for
|
||||
the owning gid to mean anything.
|
||||
|
||||
`isolation.nixDaemon`
|
||||
: Whether the Nix daemon and CLI are available inside the container.
|
||||
@@ -293,7 +295,6 @@ rec {
|
||||
+ lib.optionalString useIdmap ":idmap"
|
||||
) allBindMounts;
|
||||
bindMountHostPaths = map (bm: bm.hostPath) (lib.attrValues allBindMounts);
|
||||
deviceFlags = map (d: "--bind=${d}") devices;
|
||||
inherit (deriveIdentity ifPrefix.nspawn name)
|
||||
iface
|
||||
mac
|
||||
@@ -380,7 +381,7 @@ rec {
|
||||
nixosContainer = {
|
||||
inherit autoStart privateUsers;
|
||||
bindMounts = { };
|
||||
extraFlags = bindMountExtraFlags ++ deviceFlags;
|
||||
extraFlags = bindMountExtraFlags;
|
||||
privateNetwork = true;
|
||||
extraVeths = linkVeths;
|
||||
config =
|
||||
|
||||
@@ -333,6 +333,11 @@ with subtest("(functional): published ports follow the container's lifetime"):
|
||||
with subtest("(functional): declared devices are usable in-container"):
|
||||
for name, devices in DEVICES.items():
|
||||
for dev in devices:
|
||||
if server.execute(f"test -e {dev}")[0] != 0:
|
||||
# host lacks the device (e.g. /dev/kvm without nested
|
||||
# virtualization, as in this test's own VM) - nspawn skips
|
||||
# populating it in-container, so there's nothing to check.
|
||||
continue
|
||||
# opened, not stat'd: without DeviceAllow= the node is still visible
|
||||
server.succeed(ct_cmd(name, f"exec 3<> {dev}"))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user