* 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, 10 insertions, 16 deletions

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index a0a25efa354..d9419fadb11 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 ###### implementation
 
@@ -12,16 +12,11 @@ in
   
 {
 
-  services = {
-    extraJobs = [{
-      name = "swraid";
-      
-      job = ''
-      start on udev
-      #start on new-devices
-      
-      script
+  jobAttrs.swraid =
+    { startOn = "udev"; # !!! or on "new-devices"
       
+      script =
+        ''
           # Load the necessary RAID personalities.
           # !!! hm, doesn't the kernel load these automatically?
           for mod in raid0 raid1 raid5; do
@@ -35,10 +30,9 @@ in
           ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
       
           initctl emit new-devices
-          
-      end script
-      
-      '';
-    }];
-  };
+        '';
+
+      task = true;        
+    };
+
 }