* Do some more jobs.

svn path=/nixos/branches/upstart-0.6/; revision=18212

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 =
+      exec =
-        ''
+        "${pkgs.sysklogd}/sbin/klogd -c 1 -2 -n " +
-          # !!! this hangs for some reason (it blocks reading from
+        "-k $(dirname $(readlink -f /var/run/booted-system/kernel))/System.map";
-          # /proc/kmsg).
-          #${klogdCmd} -o
-        '';
-
-      exec = "${klogdCmd} -n";
     };
     
 }

modules/services/logging/syslogd.nix

@@ -50,12 +50,13 @@ in
     jobs.syslogd =
       { description = "Syslog daemon";
 
-        startOn = "udev";
+        startOn = "started udev";
-        stopOn = "shutdown";
 
         environment = { TZ = config.time.timeZone; };
 
-        exec = "${pkgs.sysklogd}/sbin/syslogd -n -f ${syslogConf}";
+        daemonType = "fork";
+
+        exec = "${pkgs.sysklogd}/sbin/syslogd -f ${syslogConf}";
       };
 
   };

modules/services/networking/ssh/sshd.nix

@@ -112,8 +112,7 @@ in
 
         description = "OpenSSH server";
 
-        startOn = "network-interfaces/started";
+        startOn = "started network-interfaces";
-        stopOn = "network-interfaces/stop";
 
         environment = { LD_LIBRARY_PATH = nssModulesPath; };
 
@@ -126,7 +125,9 @@ in
             fi
           '';
 
-        exec = "${openssh}/sbin/sshd -D -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
+        daemonType = "fork";
+
+        exec = "${openssh}/sbin/sshd -h /etc/ssh/ssh_host_dsa_key -f ${sshdConfig}";
       };
 
     networking.firewall.allowedTCPPorts = [22];

modules/system/upstart/upstart.nix

@@ -31,8 +31,7 @@ let
           console output
 
           ${if isList job.startOn then
-              # This is a hack to support or-dependencies on Upstart 0.3.
+              "start on ${concatStringsSep " or " job.startOn}"
-              concatMapStrings (x: "start on ${x}\n") job.startOn
             else if job.startOn != "" then
               "start on ${job.startOn}"
             else ""

modules/tasks/network-interfaces.nix

@@ -135,7 +135,7 @@ in
     jobs.networkInterfaces = 
       { name = "network-interfaces";
 
-        startOn = "udev";
+        startOn = "started udev";
 
         preStart =
           ''