From c4fe98706b903514a0bfdd99f4f9d6f3eb735e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 4 May 2011 12:34:26 +0000 Subject: [PATCH] Fixing the samba daemons. "smbd -i", as we were using, handles *one request* and exit. When it was working more or less, it was through upstart respawn. svn path=/nixos/trunk/; revision=27140 --- modules/services/network-filesystems/samba.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/services/network-filesystems/samba.nix b/modules/services/network-filesystems/samba.nix index 20a8687cc033..e42316bf8bf8 100644 --- a/modules/services/network-filesystems/samba.nix +++ b/modules/services/network-filesystems/samba.nix @@ -72,7 +72,10 @@ let environment = { LD_LIBRARY_PATH = nssModulesPath; TZ = config.time.timeZone; + LOCALE_ARCHIVE = "/var/run/current-system/sw/lib/locale/locale-archive"; }; + + daemonType = "fork"; exec = "${samba}/sbin/${appName} ${args}"; }; @@ -210,13 +213,11 @@ in preStart = setupScript; }; - # nmbd says "standard input is not a socket, assuming -D option", - # but using -i makes it stay in foreground (?) - jobs.nmbd = daemonJob "nmbd" " -i -F"; + jobs.nmbd = daemonJob "nmbd" "-D"; - jobs.smbd = daemonJob "smbd" " -i -F"; + jobs.smbd = daemonJob "smbd" "-D"; - jobs.winbindd = daemonJob "winbindd" " -F"; + jobs.winbindd = daemonJob "winbindd" "-D"; };