diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-11-11 01:10:37 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2022-11-11 01:10:37 +0100 |
commit | d82f52519a3a9bd3bc646bb1c9fe380b802cc8fd (patch) | |
tree | 58fc2d2f92d28b1484645061e5db19e198f998d5 /nixos/tests/libvirtd.nix | |
parent | 2a63e4f90282e9080efba2e1a96440f9ab4b42b0 (diff) |
nixos/libvirtd: always start libvirtd
Previously we did socket-activation but this breaks the autostart feature since upstream expects libvirtd to be started unconditionally on boot. Fixes #171623.
Diffstat (limited to 'nixos/tests/libvirtd.nix')
-rw-r--r-- | nixos/tests/libvirtd.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index ce122682da73e..49258fcb93eaf 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { in '' start_all() - virthost.wait_for_unit("sockets.target") + virthost.wait_for_unit("multi-user.target") with subtest("enable default network"): virthost.succeed("virsh net-start default") @@ -46,13 +46,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { virthost.succeed("virsh pool-start zfs_storagepool") virthost.succeed("virsh vol-create-as zfs_storagepool disk1 25MB") - with subtest("check if nixos install iso boots and network works"): + with subtest("check if nixos install iso boots, network and autostart works"): virthost.succeed( - "virt-install -n nixos --osinfo=nixos-unstable --ram=1024 --graphics=none --disk=`find ${nixosInstallISO}/iso -type f | head -n1`,readonly=on --import --noautoconsole" + "virt-install -n nixos --osinfo nixos-unstable --memory 1024 --graphics none --disk `find ${nixosInstallISO}/iso -type f | head -n1`,readonly=on --import --noautoconsole --autostart" ) virthost.succeed("virsh domstate nixos | grep running") virthost.wait_until_succeeds("ping -c 1 nixos") virthost.succeed("virsh ${virshShutdownCmd} nixos") virthost.wait_until_succeeds("virsh domstate nixos | grep 'shut off'") + virthost.shutdown() + virthost.wait_for_unit("multi-user.target") + virthost.wait_until_succeeds("ping -c 1 nixos") ''; }) |