public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81161 from wedens/libvirt-6.0.0

Browse Source 
libvirt: 5.4.0 -> 6.1.0
This commit is contained in:
Robin Gloster
2020-03-30 13:19:00 +00:00
committed by GitHub
parent d8c21cb4bc b80edca6be
commit d6fa642608
9 changed files with 204 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/libvirtd.nix
+7 -4
View File
@@ -214,14 +214,14 @@ in {
};
systemd.services.libvirtd = {
description = "Libvirt Virtual Machine Management Daemon";
wantedBy = [ "multi-user.target" ];
requires = [ "libvirtd-config.service" ];
after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
++ optional vswitch.enable "ovs-vswitchd.service";
environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
environment.LIBVIRTD_ARGS = escapeShellArgs (
[ "--config" configFile
"--timeout" "120" # from ${libvirt}/var/lib/sysconfig/libvirtd
] ++ cfg.extraOptions);
path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
++ optional vswitch.enable vswitch.package;
@@ -266,5 +266,8 @@ in {
serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
restartIfChanged = false;
};
systemd.sockets.libvirtd .wantedBy = [ "sockets.target" ];
systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ];
};
}