server/server-config
3
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Frcc kvm #9

Merged
flowey merged 3 commits from frcc-kvm into master 2026-09-14 01:47:43 +00:00
Conversation 1 Commits 3 Files Changed 2
+6 -2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e8cc76844d - Show all commits
dsl.nix
+1 -2
View File
@@ -295,7 +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);
deviceFlags = map (d: "--bind=${d}") devices;
inherit (deriveIdentity ifPrefix.nspawn name) inherit (deriveIdentity ifPrefix.nspawn name)
iface iface
mac mac
@@ -382,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 =
tests/server-n0/integration.py
+5
View File
@@ -333,6 +333,11 @@ 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:
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 # 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}"))