Convert "swraid"

svn path=/nixos/branches/fix-style/; revision=14400

system/options.nix

@@ -418,6 +418,7 @@ in
 
     (import ../upstart-jobs/lvm.nix) # Makes LVM logical volumes available.
 
+    (import ../upstart-jobs/swraid.nix) # Activate software RAID arrays.
 
 
     # security

upstart-jobs/default.nix

@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Activate software RAID arrays.
-    (import ../upstart-jobs/swraid.nix {
-      inherit modprobe;
-      inherit (pkgs) mdadm;
-    })
-      
     # Mount file systems.
     (import ../upstart-jobs/filesystems.nix {
       inherit mount;

upstart-jobs/swraid.nix

@@ -1,15 +1,22 @@
-{modprobe, mdadm}:
+{pkgs, config, ...}:
+
+###### implementation
 
 let
 
   tempConf = "/var/run/mdadm.conf";
+  modprobe = config.system.sbin.modprobe;
+  inherit (pkgs) mdadm;
 
 in
   
 {
+
+  services = {
+    extraJobs = [{
       name = "swraid";
       
-  job = "
+      job = ''
       start on udev
       #start on new-devices
       
@@ -31,6 +38,7 @@ script
           
       end script
       
-  ";
-
+      '';
+    }];
+  };
 }