actually bind /dev/kvm into the container, and test it initializes

DeviceAllow= only grants cgroup permission to open a device node - it
doesn't create one, and nspawn can't mknod a device inside a user
namespace. The node needs an explicit bind from the host as well, so
both are required together.

Also add a test that actually boots qemu-system-x86_64 -enable-kvm
(no disk, killed by timeout) and checks for "Permission denied" /
"Could not access KVM" in its output, rather than just checking the
node opens - a wrong-gid or unmapped node still opens but fails the
ioctls qemu needs.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Dzy7tEKLCFFXD96LmR8we3

configuration.nix

@@ -4,27 +4,12 @@
   lib,
   hostInfo,
   customPkgs,
-  flakeRev,
   ...
 }:
 let
   inherit (hostInfo) paths;
 in
 {
-  imports = [ ./modules/autodeploy.nix ];
-
-  services.server-autodeploy = {
-    enable = true;
-    giteaUrl = "https://git.floweytf.com/";
-    giteaRepo = "server/server-config";
-    tokenFile = "${hostInfo.paths.secrets}/gitea-autodeploy-token";
-    allowedSigners = [
-      "flowey@arch namespaces=\"git\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaGpTX3EzfezVc2nl3MgsKVamYYP2h2VJaRny8pZkvi"
-    ];
-    stateDir = hostInfo.paths.config;
-    repoOwner = "server";
-  };
-
   assertions =
     let
       isMounted =
@@ -62,14 +47,6 @@ in
 
   time.timeZone = "UTC";
   system.stateVersion = "26.05";
-  system.nixos.label =
-    let
-      labelFile = ./.nixos-label;
-    in
-    if builtins.pathExists labelFile then
-      lib.removeSuffix "\n" (builtins.readFile labelFile)
-    else
-      flakeRev;
 
   nix = {
     settings = {

containers/server-n0/git.nix

@@ -176,9 +176,8 @@ in
               PermitEmptyPasswords = "yes";
             };
           };
-          security.pam.services.sshd.allowNullPassword = true;
           users.users.root.initialHashedPassword = "";
-          services.journald.settings.Journal.ForwardToConsole = "yes";
+          services.journald.extraConfig = "ForwardToConsole=yes";
 
           virtualisation.containerd.enable = true;
           virtualisation.containerd.settings.plugins."io.containerd.snapshotter.v1.overlayfs".mount_options =

containers/server-n0/mail.nix

@@ -146,8 +146,6 @@ let
 in
 mkContainer {
   inherit name;
-  includedInTests = false; # TODO: fixme, clearly mail is flakey
-
   net.access = [ { to = "@internet"; } ];
   svc.autoStart = true;
   net.forward.tcp = [

dsl.nix

@@ -1269,7 +1269,7 @@ rec {
         # containers don't forward journal to console by default
         containers = lib.genAttrs nspawnNames (_: {
           timeoutStartSec = "10min";
-          config.services.journald.settings.Journal.ForwardToConsole = "yes";
+          config.services.journald.extraConfig = "ForwardToConsole=yes";
         });
 
         # a test VM has neither the memory to hand out nor the cores to divide.

flake.lock

@@ -26,11 +26,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1789506833,
+        "lastModified": 1786300091,
-        "narHash": "sha256-4L8SOCF84de1irB72Ka9VHcu9wrAJ9Amuey4lU9oh4Y=",
+        "narHash": "sha256-4UFJOVGpaYtHW5yasSv80MaJxTBYdk2zyf3jhKtt0wA=",
         "owner": "microvm-nix",
         "repo": "microvm.nix",
-        "rev": "187b0a390ee054028106a674e7b01b1cb940cbba",
+        "rev": "71beea0076cd46dafcee97a5a2e7d00cbba5bd2f",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1789546076,
+        "lastModified": 1786384358,
-        "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=",
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
     "spectrum": {
       "flake": false,
       "locked": {
-        "lastModified": 1786032750,
+        "lastModified": 1785761586,
-        "narHash": "sha256-+Ba/kIn5BjvV7PN8bWOo7RoqgTY/Yv2M7qeMf3wS2Ag=",
+        "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=",
         "ref": "refs/heads/main",
-        "rev": "77d2389874bb092b8dbf05ecc5b1030372e80e98",
+        "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9",
-        "revCount": 1417,
+        "revCount": 1416,
         "type": "git",
         "url": "https://spectrum-os.org/git/spectrum"
       },

flake.nix

@@ -11,7 +11,6 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       mtce,
       microvm,
@@ -22,8 +21,6 @@
       inherit (nixpkgs) lib;
       pkgs = import nixpkgs { inherit system; };
 
-      flakeRev = self.shortRev or self.dirtyShortRev or "unknown";
-
       customPkgs = {
         hopper-rs = pkgs.callPackage ./packages/hopper-rs.nix { };
         sshpiper = pkgs.callPackage ./packages/sshpiper.nix { };
@@ -32,7 +29,6 @@
         server-rebuild = pkgs.callPackage ./packages/server-rebuild.nix { };
         server-status = pkgs.callPackage ./packages/server-status.nix { };
         server-kexec = pkgs.callPackage ./packages/server-kexec.nix { };
-        server-autodeploy = pkgs.callPackage ./packages/server-autodeploy.nix { };
       };
 
       ci = import ./ci.nix { inherit lib pkgs; };
@@ -50,13 +46,12 @@
           server = "/persist/@containers";
           data = "/persist/@containers/data";
           secrets = "/persist/@secrets/";
-          config = "/persist/@config/";
         };
       };
 
       specialArgsFor = hostName: {
         hostInfo = hostInfoFor hostName;
-        inherit inputs customPkgs flakeRev;
+        inherit inputs customPkgs;
       };
 
       hostDefFor =
@@ -152,7 +147,6 @@
           server-rebuild
           server-status
           server-kexec
-          server-autodeploy
           ;
       };
     };

modules/autodeploy.nix

@@ -1,96 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  customPkgs,
-  ...
-}:
-let
-  cfg = config.services.server-autodeploy;
-in
-{
-  options.services.server-autodeploy = {
-    enable = lib.mkEnableOption "automatic deployment from signed git tags";
-
-    interval = lib.mkOption {
-      type = lib.types.str;
-      default = "15min";
-    };
-
-    branch = lib.mkOption {
-      type = lib.types.str;
-      default = "master";
-    };
-
-    giteaUrl = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    giteaRepo = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    tokenFile = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    allowedSigners = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-    };
-    
-    repoOwner = lib.mkOption {
-      type = lib.types.str;
-      description = "User that owns the configuration checkout";
-    };
-
-    stateDir = lib.mkOption {
-      type = lib.types.str;
-    };
-
-    hostname = lib.mkOption {
-      type = lib.types.str;
-      default = config.networking.hostName;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.server-autodeploy = {
-      description = "Deploy latest signed tag";
-      after = [ "network-online.target" ];
-      wants = [ "network-online.target" ];
-
-      environment = {
-        GITEA_URL = cfg.giteaUrl;
-        GITEA_REPO = cfg.giteaRepo;
-        TOKEN_FILE = cfg.tokenFile;
-        ALLOWED_SIGNERS = builtins.toFile "signers" (lib.join "\n" cfg.allowedSigners);
-        DEPLOY_BRANCH = cfg.branch;
-        STATE_DIR = cfg.stateDir;
-        REPO_DIR = "/persist/@configuration";
-        REPO_OWNER = cfg.repoOwner;
-        HOSTNAME = cfg.hostname;
-      };
-
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = lib.getExe customPkgs.server-autodeploy;
-        TimeoutStartSec = "30min";
-      };
-
-      path = [
-        config.nix.package
-        pkgs.nixos-rebuild
-      ];
-    };
-
-    systemd.timers.server-autodeploy = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnBootSec = "2min";
-        OnUnitActiveSec = cfg.interval;
-        RandomizedDelaySec = "2min";
-      };
-    };
-  };
-}

packages/server-autodeploy.nix

@@ -1,18 +0,0 @@
-{
-  writeShellApplication,
-  git,
-  curl,
-  jq,
-  util-linux,
-  openssh,
-}:
-import ./mk-script.nix { inherit writeShellApplication; } {
-  name = "server-autodeploy";
-  runtimeInputs = [
-    git
-    curl
-    jq
-    util-linux
-    openssh
-  ];
-}

scripts/server-autodeploy.sh

@@ -1,60 +0,0 @@
-REPO_DIR="${REPO_DIR:-/persist/@configuration}"
-STATE_DIR="${STATE_DIR:-/persist/@autodeploy}"
-BRANCH="origin/${DEPLOY_BRANCH:-master}"
-
-mkdir -p "$STATE_DIR"
-exec 9>"$STATE_DIR/lock"
-flock -n 9 || { echo "another deploy running"; exit 0; }
-
-runas() { runuser -u "$REPO_OWNER" -- "$@"; }
-
-report_status() {
-  echo "updating status to: $1 - $2"
-  [[ -f "$TOKEN_FILE" ]] || return 0
-  curl -sf -X POST \
-    -H "Authorization: token $(<"$TOKEN_FILE")" \
-    -H "Content-Type: application/json" \
-    -d "$(jq -n --arg s "$1" --arg d "$2" --arg c "deploy/$HOSTNAME" \
-      '{state:$s,description:$d,context:$c}')" \
-    "$GITEA_URL/api/v1/repos/$GITEA_REPO/statuses/$3" >/dev/null
-}
-
-cd "$REPO_DIR"
-
-export GIT_CONFIG_COUNT=2
-export GIT_CONFIG_KEY_0=gpg.format
-export GIT_CONFIG_VALUE_0=ssh
-export GIT_CONFIG_KEY_1=gpg.ssh.allowedSignersFile
-export GIT_CONFIG_VALUE_1="$ALLOWED_SIGNERS"
-
-runas git fetch origin --tags --prune-tags
-
-latest=$(runas git describe --abbrev=0 "$BRANCH" 2>/dev/null) || {
-  echo "no tags on $BRANCH"
-  exit 0
-}
-
-current=$(cat "$STATE_DIR/tag" 2>/dev/null) || true
-[[ "$latest" != "$current" ]] || { echo "already at $latest"; exit 0; }
-
-echo "new tag: $latest (current: ${current:-none})"
-
-runas git tag -v "$latest" || {
-  sha=$(runas git rev-list -1 "$latest")
-  report_status "failure" "tag signature verification failed" "$sha"
-  exit 1
-}
-
-sha=$(runas git rev-list -1 "$latest")
-report_status "pending" "deploying $latest" "$sha"
-
-flake_url="git+${GITEA_URL}/${GITEA_REPO}?ref=refs/tags/${latest}&rev=${sha}#$HOSTNAME"
-
-if nixos-rebuild switch --flake "$flake_url"; then
-  echo "$latest" > "$STATE_DIR/tag"
-  report_status "success" "deployed $latest" "$sha"
-  echo "deployed $latest"
-else
-  report_status "failure" "nixos-rebuild failed" "$sha"
-  exit 1
-fi

tests/server-n0/integration.py

@@ -153,8 +153,6 @@ with subtest("(functional): web services respond"):
     for name, port in [("devenv", 8080), ("maven", 8080), ("git", 3000)]:
         server.succeed(net_cmd(name, f"{CURL} -sf --max-time 5 -o /dev/null http://{ADDR[name]}:{port}/ >&2"))
 
-# TODO: re-enable mail
-"""
 with subtest("(functional): mail accepts connections"):
     smtp_probe = net_cmd("mail", f"{SH} -c 'exec 3<>/dev/tcp/{ADDR['mail']}/25 && head -1 <&3'")
     server.wait_until_succeeds(f"{smtp_probe} | grep -q '^220'", timeout=60)
@@ -169,7 +167,6 @@ with subtest("(functional): mail accepts connections"):
         return greeting.strip().startswith("* OK")
 
     retry(imap_ready, timeout_seconds=60)
-"""
 
 with subtest("(functional): nginx proxies to backend containers"):
     server.succeed(
@@ -200,7 +197,7 @@ with subtest("(isolation): undeclared container edges are refused"):
         ("devenv", "git", 3000),
         ("git", "devenv", 8080),
         ("maven", "git", 3000),
-        # ("nginx", "mail", 25),
+        ("nginx", "mail", 25),
         ("ssh-botm", "ssh-admin", 22),
         ("overseer", "git", 3000),
     ]:
@@ -253,7 +250,7 @@ with subtest("(isolation): renaming the interface changes nothing"):
     rename(iface, "evil0")
     try:
         server.succeed(ct_connect("nginx", ADDR["git"], 3000))
-        # server.fail(ct_connect("nginx", ADDR["mail"], 25, timeout=2))
+        server.fail(ct_connect("nginx", ADDR["mail"], 25, timeout=2))
     finally:
         rename("evil0", iface)