Convert "maintenance-shell"

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

system/options.nix

@@ -425,6 +425,7 @@ in
     (import ../upstart-jobs/swap.nix)
     (import ../upstart-jobs/network-interfaces.nix)
     (import ../upstart-jobs/nscd.nix) # Name service cache daemon.
+    (import ../upstart-jobs/maintenance-shell.nix) # Handles the maintenance/stalled event (single-user shell).
 
     # security
     (import ../system/sudo.nix)

upstart-jobs/default.nix

@@ -71,11 +71,6 @@ let
   jobs = map makeJob
     ([
     
-    # Handles the maintenance/stalled event (single-user shell).
-    (import ../upstart-jobs/maintenance-shell.nix {
-      inherit (pkgs) bash;
-    })
-
     # Ctrl-alt-delete action.
     (import ../upstart-jobs/ctrl-alt-delete.nix)
 

upstart-jobs/maintenance-shell.nix

@@ -1,9 +1,13 @@
-{bash}:
+{pkgs, config, ...}:
+
+###### implementation
 
 {
+  services = {
+    extraJobs = [{
       name = "maintenance-shell";
       
-  job = "
+      job = ''
           start on maintenance
           start on stalled
           
@@ -12,8 +16,9 @@ script
               echo \"\"
               echo \"<<< MAINTENANCE SHELL >>>\"
               echo \"\"
-    exec ${bash}/bin/sh
+              exec ${pkgs.bash}/bin/sh
           end script
-  ";
+      '';
-  
+  }];
+  };
 }