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

openvswitch service: fix ipsec startup order

+3 -3
+3 -3
nixos/modules/virtualisation/openvswitch.nix
··· 67 67 description = "Open_vSwitch Database Server"; 68 68 wantedBy = [ "multi-user.target" ]; 69 69 after = [ "systemd-udev-settle.service" ]; 70 - wants = [ "vswitchd.service" ]; 71 70 path = [ cfg.package ]; 72 71 restartTriggers = [ db cfg.package ]; 73 72 # Create the config database ··· 108 107 109 108 systemd.services.vswitchd = { 110 109 description = "Open_vSwitch Daemon"; 110 + wantedBy = [ "multi-user.target" ]; 111 111 bindsTo = [ "ovsdb.service" ]; 112 112 after = [ "ovsdb.service" ]; 113 113 path = [ cfg.package ]; ··· 135 135 systemd.services.ovs-monitor-ipsec = { 136 136 description = "Open_vSwitch Ipsec Daemon"; 137 137 wantedBy = [ "multi-user.target" ]; 138 - requires = [ "racoon.service" ]; 139 - after = [ "vswitchd.service" ]; 138 + requires = [ "ovsdb.service" ]; 139 + before = [ "vswitchd.service" "racoon.service" ]; 140 140 environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; 141 141 serviceConfig = { 142 142 ExecStart = ''