From 8e8b3f9313e79ef630e5a99a147f43b6ec224bb4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Nov 2009 17:25:35 +0000
Subject: [PATCH] * Mount /var/run/nscd only once.

svn path=/nixos/branches/upstart-0.6/; revision=18607
---
 modules/system/activation/activation-script.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index c29c82dd7ae..df3806b834b 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -89,8 +89,10 @@ let
       # (Upstart 0.6 apparently uses nscd to do some name lookups,
       # resulting in it holding some mmap mapping to deleted files in
       # /var/run/nscd.)
-      mkdir -p /var/run/nscd
-      ${pkgs.utillinux}/bin/mount -t tmpfs -o "mode=755" none /var/run/nscd
+      if [ ! -e /var/run/nscd ]; then
+          mkdir -p /var/run/nscd
+          ${pkgs.utillinux}/bin/mount -t tmpfs -o "mode=755" none /var/run/nscd
+      fi
 
       mkdir -m 0755 -p /var/log