movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-08 11:35:37 +03:00
Code Activity

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

Browse source 
openvswitch service: fix ipsec startup order
This commit is contained in:
Jaka Hudoklin 2015-08-29 19:19:56 +02:00
commit be1d6923a8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/virtualisation/openvswitch.nix
View file

@ -67,7 +67,6 @@ in {
description = "Open_vSwitch Database Server"; description = "Open_vSwitch Database Server";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ];
wants = [ "vswitchd.service" ];
path = [ cfg.package ]; path = [ cfg.package ];
restartTriggers = [ db cfg.package ]; restartTriggers = [ db cfg.package ];
# Create the config database # Create the config database
@ -108,6 +107,7 @@ in {
systemd.services.vswitchd = { systemd.services.vswitchd = {
description = "Open_vSwitch Daemon"; description = "Open_vSwitch Daemon";
wantedBy = [ "multi-user.target" ];
bindsTo = [ "ovsdb.service" ]; bindsTo = [ "ovsdb.service" ];
after = [ "ovsdb.service" ]; after = [ "ovsdb.service" ];
path = [ cfg.package ]; path = [ cfg.package ];
@ -135,8 +135,8 @@ in {
systemd.services.ovs-monitor-ipsec = { systemd.services.ovs-monitor-ipsec = {
description = "Open_vSwitch Ipsec Daemon"; description = "Open_vSwitch Ipsec Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "racoon.service" ]; requires = [ "ovsdb.service" ];
after = [ "vswitchd.service" ]; before = [ "vswitchd.service" "racoon.service" ];
environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock";
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''