diff options
| author | Thomas Strobel <thomas@strobel.eu> | 2015-09-24 10:24:54 +0200 |
|---|---|---|
| committer | Thomas Strobel <ts468@cam.ac.uk> | 2015-09-24 10:27:33 +0200 |
| commit | fcab752abf94ae36e903097846c752d6b22e0dff (patch) | |
| tree | 9beb493f518ff83027ebb1f6a35da17ae9e297c7 /nixos/modules/virtualisation/openvswitch.nix | |
| parent | 502014b07eb4cbcf7c8e620bcf5209e5f6b74a74 (diff) | |
| download | nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.tar nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.tar.gz nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.tar.bz2 nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.tar.lz nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.tar.xz nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.tar.zst nixpkgs-fcab752abf94ae36e903097846c752d6b22e0dff.zip | |
openvswitch module: do not fork services
Diffstat (limited to 'nixos/modules/virtualisation/openvswitch.nix')
| -rw-r--r-- | nixos/modules/virtualisation/openvswitch.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index b5155246fda..1c77945a6cb 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -92,13 +92,11 @@ in { --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ --pidfile=/var/run/openvswitch/ovsdb.pid \ - --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; RestartSec = 3; PIDFile = "/var/run/openvswitch/ovsdb.pid"; - Type = "forking"; }; postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init @@ -114,11 +112,9 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ - --detach + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid ''; PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; - Type = "forking"; }; }; @@ -143,11 +139,10 @@ in { ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor --detach \ + --monitor \ unix:/var/run/openvswitch/db.sock ''; PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; - Type = "forking"; }; preStart = '' |