diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-11-14 09:21:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 09:21:00 +0100 |
| commit | 2274143409cc7d8b2d6b3df9f415a37a825cfd7b (patch) | |
| tree | 43cf9b9fef880151994ff5002345306a53b92398 /nixos | |
| parent | f690a10b8521345973cc618accb2d32c86d6038b (diff) | |
| parent | d82f52519a3a9bd3bc646bb1c9fe380b802cc8fd (diff) | |
Merge pull request #200611 from fpletz/libvirtd-fix-autostart
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/libvirtd.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/libvirtd.nix | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index be6ebb3eacc99..3b30bc8c41658 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -336,6 +336,7 @@ in }; systemd.services.libvirtd = { + wantedBy = [ "multi-user.target" ]; requires = [ "libvirtd-config.service" ]; after = [ "libvirtd-config.service" ] ++ optional vswitch.enable "ovs-vswitchd.service"; 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") ''; }) |