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

Merge pull request #53033 from netixx/openvswitch-improved-systemd

Browse Source 
openvswitch: better integration with systemd
This commit is contained in:
Jörg Thalheim
2020-02-21 08:24:49 +00:00
committed by GitHub
parent c38529df78 cd3597b486
commit 1ddb140d95
6 changed files with 151 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/libvirtd.nix
+1 -1
View File
@@ -219,7 +219,7 @@ in {
wantedBy = [ "multi-user.target" ];
requires = [ "libvirtd-config.service" ];
after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
++ optional vswitch.enable "vswitchd.service";
++ optional vswitch.enable "ovs-vswitchd.service";
environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
nixos/modules/virtualisation/openvswitch.nix
+6 -1
View File
@@ -124,7 +124,7 @@ in {
'';
};
systemd.services.vswitchd = {
systemd.services.ovs-vswitchd = {
description = "Open_vSwitch Daemon";
wantedBy = [ "multi-user.target" ];
bindsTo = [ "ovsdb.service" ];
@@ -139,6 +139,8 @@ in {
PIDFile = "/run/openvswitch/ovs-vswitchd.pid";
# Use service type 'forking' to correctly determine when vswitchd is ready.
Type = "forking";
Restart = "always";
RestartSec = 3;
};
};
@@ -182,4 +184,7 @@ in {
'';
};
})]));
meta.maintainers = with maintainers; [ netixx ];
}