diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-19 11:42:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 11:42:06 +0000 |
| commit | 86dd3f854b45ea07710b2ea729de35c2041a533e (patch) | |
| tree | 5e2e4792f640ea3a4384087b383b4319ccdb8996 /nixos/modules | |
| parent | 6e22dd9ee8a890d346e02a6a220df7bc9a0b2759 (diff) | |
| parent | bf5e8ce96b059b49c63a135066417aedbab25377 (diff) | |
| download | nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.gz nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.bz2 nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.lz nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.xz nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.tar.zst nixlib-86dd3f854b45ea07710b2ea729de35c2041a533e.zip | |
Merge pull request #35687 from volth/libvirt-4.1.0
libvirt: 3.10.0 -> 4.1.0
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/virtualisation/libvirtd.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index a369b7ddbe1d..024db7f87c2e 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -119,18 +119,10 @@ in { after = [ "systemd-udev-settle.service" ] ++ optional vswitch.enable "vswitchd.service"; - environment = { - LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; - }; + environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; - path = with pkgs; [ - bridge-utils - dmidecode - dnsmasq - ebtables - cfg.qemuPackage # libvirtd requires qemu-img to manage disk images - ] - ++ optional vswitch.enable vswitch.package; + path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images + ++ optional vswitch.enable vswitch.package; preStart = '' mkdir -p /var/log/libvirt/qemu -m 755 |