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
This commit is contained in:
Lluís Batlle i Rossell 2011-05-04 12:34:26 +00:00
parent dc111c7425
commit c4fe98706b

View file

@ -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";
};