* Converted modules that were still using the old (concrete syntax)

  style of declaring Upstart jobs.  While at it, converted them to the
  current NixOS module style and improved some option descriptions.
  Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761

1 files changed, 14 insertions, 18 deletions

diff --git a/modules/services/logging/klogd.nix b/modules/services/logging/klogd.nix
index 59ab51fea928..f8c26e0f1666 100644
--- a/modules/services/logging/klogd.nix
+++ b/modules/services/logging/klogd.nix
@@ -1,8 +1,8 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 ###### implementation
+
 let
-  inherit (pkgs.lib);
 
   klogdCmd = "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
 
@@ -10,24 +10,20 @@ in
 
 {
 
-  services = {
-    extraJobs = [{
-      name = "klogd";
-      
-      job = ''
-        description "Kernel log daemon"
-      
-        start on syslogd
-        stop on shutdown
-
-        start script
+  jobAttrs.klogd =
+    { description = "Kernel log daemon";
+
+      startOn = "syslogd";
+      stopOn = "shutdown";
+
+      preStart =
+        ''
           # !!! this hangs for some reason (it blocks reading from
           # /proc/kmsg).
           #${klogdCmd} -o
-        end script
+        '';
 
-        respawn ${klogdCmd} -n
-      '';
-    }];
-  };
+      exec = "${klogdCmd} -n";
+    };
+    
 }