+63
-11
nixos/modules/virtualisation/incus.nix
+63
-11
nixos/modules/virtualisation/incus.nix
············+ExecStop = lib.optionalString (!cfg.softDaemonRestart) "${cfg.package}/bin/incus admin shutdown";···
+45
-36
nixos/tests/incus/container.nix
+45
-36
nixos/tests/incus/container.nix
···-assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}"+assert cpuinfo == "1", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 1, got: {cpuinfo}"+assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}"-assert cpuinfo == "2", f"Wrong number of CPUs reported from /proc/cpuinfo, want: 2, got: {cpuinfo}"+assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'"-assert meminfo_bytes == "62500 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '62500 kB', got: '{meminfo_bytes}'"+assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'"-assert meminfo_bytes == "125000 kB", f"Wrong amount of memory reported from /proc/meminfo, want: '125000 kB', got: '{meminfo_bytes}'"+machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")-machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")+machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")+target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()+assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"-machine.fail("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")-target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()-assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"+machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")-machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")+with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"):
+1
-1
nixos/tests/incus/default.nix
+1
-1
nixos/tests/incus/default.nix
···
+104
nixos/tests/incus/incusd-options.nix
+104
nixos/tests/incus/incusd-options.nix
···+status, _ = machine.execute("incus exec container --disable-stdin --force-interactive /run/current-system/sw/bin/systemctl -- is-system-running")+machine.succeed("incus image import ${container-image-metadata}/*/*.tar.xz ${container-image-rootfs}/*/*.tar.xz --alias nixos")+with subtest("Instance is stopped when softDaemonRestart is disabled and services is stopped"):
-63
nixos/tests/incus/preseed.nix
-63
nixos/tests/incus/preseed.nix
···
+6
nixos/tests/incus/virtual-machine.nix
+6
nixos/tests/incus/virtual-machine.nix
···+with subtest("Instance remains running when softDaemonRestart is enabled and services is stopped"):