Convert "swap"

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

system/options.nix

@@ -422,6 +422,8 @@ in
 
     (import ../upstart-jobs/filesystems.nix) # Mount file systems.
 
+    (import ../upstart-jobs/swap.nix)
+
 
     # security
     (import ../system/sudo.nix)

upstart-jobs/default.nix

@@ -71,12 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Swapping.
-    (import ../upstart-jobs/swap.nix {
-      inherit (pkgs) utillinux lib;
-      swapDevices = config.swapDevices;
-    })
-
     # Network interfaces.
     (import ../upstart-jobs/network-interfaces.nix {
       inherit modprobe config;

upstart-jobs/swap.nix

@@ -1,7 +1,13 @@
-{lib, utillinux, swapDevices}:
+{pkgs, config, ...}:
+
+###### implementation
 
 let
 
+  inherit (pkgs) utillinux lib;
+
+  swapDevices = config.swapDevices;
+
   devicesByPath =
     map (x: x.device) (lib.filter (x: x ? device) swapDevices);
     
@@ -10,7 +16,10 @@ let
 
 in
 
+
 {
+  services = {
+    extraJobs = [{
       name = "swap";
       
       job = "
@@ -40,5 +49,6 @@ script
             
         end script
       ";
-
+    }];
+  };
 }