summary refs log tree commit diff
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2019-07-03 12:26:47 -0700
committerJamey Sharp <jamey@minilop.net>2019-07-03 12:26:47 -0700
commit93f185df6555de235e7d188682ea54767d8cfbc2 (patch)
treee5312d14712f57b5769af3d43f430196ae5c014b
parent48afae7da7e19d8678f02d2606ee1280b0bfb19f (diff)
downloadnixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.tar
nixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.tar.gz
nixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.tar.bz2
nixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.tar.lz
nixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.tar.xz
nixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.tar.zst
nixpkgs-93f185df6555de235e7d188682ea54767d8cfbc2.zip
nixos/nscd: no longer need to wait for readiness
This postStart step was introduced on 2014-04-24 with the comment that
"Nscd forks into the background before it's ready to accept
connections."

However, that was fixed upstream almost two months earlier, on
2014-03-03, with the comment that "This, along with setting the nscd
service type to forking in its systemd configuration file, allows
systemd to be certain that the nscd service is ready and is accepting
connections."

The fix was released several months later in glibc 2.20, which was
merged in NixOS sometime before 15.09, so it certainly should be safe to
remove this workaround by now.
-rw-r--r--nixos/modules/services/system/nscd.nix9
1 files changed, 0 insertions, 9 deletions
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index fd1570d1198..d9444a279ea 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -75,15 +75,6 @@ in
                 "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts"
               ];
           };
-
-        # Urgggggh... Nscd forks before opening its socket and writing
-        # its pid. So wait until it's ready.
-        postStart =
-          ''
-            while ! ${pkgs.glibc.bin}/sbin/nscd -g > /dev/null; do
-              sleep 0.2
-            done
-          '';
       };
 
   };