Merge pull request #49736 from nh2/glusterfs-service-simple-unit-no-f…

…orking glusterfs service: Switch to simple unit instead of forking
NixOS · Nov 14, 2018 · 231e671 · 231e671
2 parents 6f607b8 + 92f40ba
commit 231e671
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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;
       };