diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-08-29 19:19:56 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-08-29 19:19:56 +0200 |
| commit | be1d6923a87dd075db4ae8c363ca16e4dfd5367c (patch) | |
| tree | fc8843829e78c3e4c402f790647be6da145837d2 /nixos/modules | |
| parent | eaaad0deea37f659af606abe7a594a4ed95f4dbd (diff) | |
| parent | 29c0262708a6524f9de0cd96fa7b8df12891ea00 (diff) | |
| download | nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.tar nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.tar.gz nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.tar.bz2 nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.tar.lz nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.tar.xz nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.tar.zst nixlib-be1d6923a87dd075db4ae8c363ca16e4dfd5367c.zip | |
Merge pull request #9528 from offlinehacker/nixos/openvswitch/startup_fix
openvswitch service: fix ipsec startup order
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/virtualisation/openvswitch.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 69ca13a71479..b5155246fdad 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -67,7 +67,6 @@ in { 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 @@ -108,6 +107,7 @@ in { systemd.services.vswitchd = { description = "Open_vSwitch Daemon"; + wantedBy = [ "multi-user.target" ]; bindsTo = [ "ovsdb.service" ]; after = [ "ovsdb.service" ]; path = [ cfg.package ]; @@ -135,8 +135,8 @@ in { 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 = '' |