Merge pull request #9528 from offlinehacker/nixos/openvswitch/startup_fix

openvswitch service: fix ipsec startup order

Changed files
+3 -3
nixos
modules
virtualisation
+3 -3
nixos/modules/virtualisation/openvswitch.nix
···
description = "Open_vSwitch Database Server";
wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ];
-
wants = [ "vswitchd.service" ];
path = [ cfg.package ];
restartTriggers = [ db cfg.package ];
# Create the config database
···
systemd.services.vswitchd = {
description = "Open_vSwitch Daemon";
+
wantedBy = [ "multi-user.target" ];
bindsTo = [ "ovsdb.service" ];
after = [ "ovsdb.service" ];
path = [ cfg.package ];
···
systemd.services.ovs-monitor-ipsec = {
description = "Open_vSwitch Ipsec Daemon";
wantedBy = [ "multi-user.target" ];
-
requires = [ "racoon.service" ];
-
after = [ "vswitchd.service" ];
+
requires = [ "ovsdb.service" ];
+
before = [ "vswitchd.service" "racoon.service" ];
environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock";
serviceConfig = {
ExecStart = ''