Author: viric
Date: Wed May 4 12:34:26 2011
New Revision: 27140
URL: https://svn.nixos.org/websvn/nix/?rev=27140&sc=1
Log:
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.
Modified:
nixos/trunk/modules/services/network-filesystems/samba.nix
Modified: nixos/trunk/modules/services/network-filesystems/samba.nix
==============================================================================
--- nixos/trunk/modules/services/network-filesystems/samba.nix Wed May 4
12:25:52 2011 (r27139)
+++ nixos/trunk/modules/services/network-filesystems/samba.nix Wed May 4
12:34:26 2011 (r27140)
@@ -72,7 +72,10 @@
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 @@
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";
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
