diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-12 06:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 06:01:24 +0000 |
| commit | 0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972 (patch) | |
| tree | ca02618ac17bd2766d81a70e0762d8afe590e1c0 /nixos/modules | |
| parent | fd6d62aa3de1a740017b8df7a36da312940f09bd (diff) | |
| parent | b06f0e538579ee970095fb0c0b0bb22995a7eef6 (diff) | |
| download | nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.tar nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.tar.gz nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.tar.bz2 nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.tar.lz nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.tar.xz nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.tar.zst nixlib-0917422ffe4b725fdecb70b5b5a2fbfbdb8e4972.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/virtualisation/incus.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index a561c5682ae5..74217b2411ac 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -164,19 +164,24 @@ in "network-online.target" "lxcfs.service" "incus.socket" - ]; + ] + ++ lib.optional config.virtualisation.vswitch.enable "ovs-vswitchd.service"; + requires = [ "lxcfs.service" "incus.socket" - ]; + ] + ++ lib.optional config.virtualisation.vswitch.enable "ovs-vswitchd.service"; + wants = [ "network-online.target" ]; - path = lib.mkIf config.boot.zfs.enabled [ + path = lib.optional config.boot.zfs.enabled [ config.boot.zfs.package "${config.boot.zfs.package}/lib/udev" - ]; + ] + ++ lib.optional config.virtualisation.vswitch.enable config.virtualisation.vswitch.package; environment = lib.mkMerge [ { # Override Path to the LXC template configuration directory |