diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-06 15:46:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-11-06 15:46:56 +0000 |
| commit | 9fa2f12cc254691dd52c7ee38f77576ddf7111a0 (patch) | |
| tree | 88407b554e3913024bc98e46e1ca43409d22c07c /modules/services/logging | |
| parent | 903e92bde6508486482c6d2d18e7ac2087fc06c4 (diff) | |
| download | nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.tar nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.tar.gz nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.tar.bz2 nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.tar.lz nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.tar.xz nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.tar.zst nixlib-9fa2f12cc254691dd52c7ee38f77576ddf7111a0.zip | |
* Do some more jobs.
svn path=/nixos/branches/upstart-0.6/; revision=18212
Diffstat (limited to 'modules/services/logging')
| -rw-r--r-- | modules/services/logging/klogd.nix | 19 | ||||
| -rw-r--r-- | modules/services/logging/syslogd.nix | 7 |
2 files changed, 8 insertions, 18 deletions
diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix index 0b2e3d9ddc7e..98d9d5eeabf9 100644 --- a/modules/services/logging/klogd.nix +++ b/modules/services/logging/klogd.nix @@ -2,28 +2,17 @@ ###### implementation -let - - klogdCmd = "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map"; - -in - { jobs.klogd = { description = "Kernel log daemon"; - startOn = "syslogd"; + startOn = "started syslogd"; stopOn = "shutdown"; - preStart = - '' - # !!! this hangs for some reason (it blocks reading from - # /proc/kmsg). - #${klogdCmd} -o - ''; - - exec = "${klogdCmd} -n"; + exec = + "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " + + "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map"; }; } diff --git a/modules/services/logging/syslogd.nix b/modules/services/logging/syslogd.nix index bc6b6eb43899..7c3e54cadb05 100644 --- a/modules/services/logging/syslogd.nix +++ b/modules/services/logging/syslogd.nix @@ -50,12 +50,13 @@ in jobs.syslogd = { description = "Syslog daemon"; - startOn = "udev"; - stopOn = "shutdown"; + startOn = "started udev"; environment = { TZ = config.time.timeZone; }; - exec = "${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}"; + daemonType = "fork"; + + exec = "${pkgs.sysklogd}/sbin/syslogd -f ${syslogConf}"; }; }; |