From 274e0fd934df69ce630f40522ee4f7e9fee6d8ca Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 14 Jan 2025 20:03:50 -0500 Subject: [PATCH] incus: support per-instance lxcfs This was added in 6.4 and backported to LTS 6.0.2 --- nixos/modules/virtualisation/incus.nix | 1 + nixos/tests/incus/incus-tests.nix | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index ead0ebb1badb..73d52c162fe6 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -38,6 +38,7 @@ let libnvidia-container libxfs lvm2 + lxcfs minio minio-client nftables diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index 05c5761b62b2..f41ae58fff5c 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -293,6 +293,16 @@ import ../make-test-python.nix ( check_sysctl(f"container-{variant}2") + with subtest("supports per-instance lxcfs"): + machine.succeed(f"incus stop container-{variant}1") + machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + + machine.succeed("incus config set instances.lxcfs.per_instance=true") + + machine.succeed(f"incus start container-{variant}1") + wait_for_instance(f"container-{variant}1") + machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'") + with subtest("Instance remains running when softDaemonRestart is enabled and service is stopped"): pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()