diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-11-14 12:35:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 12:35:57 +0100 |
| commit | 231e67175809816cbcd2f7bcebb8f317b7f7dd4b (patch) | |
| tree | 7a02e0e1b2c7acab8bf523b42fe52a2c4aa53866 /nixos | |
| parent | 6f607b806d55f9fbaa67e12ad473ece36e81a497 (diff) | |
| parent | 92f40bab2b9a437cdfb1f8fedd500699b5eda92b (diff) | |
| download | nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.tar nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.tar.gz nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.tar.bz2 nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.tar.lz nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.tar.xz nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.tar.zst nixpkgs-231e67175809816cbcd2f7bcebb8f317b7f7dd4b.zip | |
Merge pull request #49736 from nh2/glusterfs-service-simple-unit-no-forking
glusterfs service: Switch to simple unit instead of forking
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/network-filesystems/glusterfs.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index adf59100f06..eb7f060c7da 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -176,10 +176,8 @@ in ''; serviceConfig = { - Type="forking"; - PIDFile="/run/glusterd.pid"; LimitNOFILE=65536; - ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}"; + ExecStart="${glusterfs}/sbin/glusterd --no-daemon --log-level=${cfg.logLevel} ${toString cfg.extraFlags}"; KillMode=cfg.killMode; TimeoutStopSec=cfg.stopKillTimeout; }; |