Convert "ctrl-alt-delete"

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

system/options.nix

@@ -426,6 +426,8 @@ in
     (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).
+    (import ../upstart-jobs/ctrl-alt-delete.nix) # Ctrl-alt-delete action.
+
 
     # security
     (import ../system/sudo.nix)

upstart-jobs/ctrl-alt-delete.nix

@@ -1,12 +1,20 @@
+{pkgs, config, ...}:
+
+###### implementation
+
 {
+
+  services = {
+    extraJobs = [{
       name = "ctrl-alt-delete";
       
-  job = "
-on ctrlaltdel
+      job = ''
+        on ctrlaltdel
         
-script
+        script
             shutdown -r now 'Ctrl-Alt-Delete pressed'
-end script
-  ";
-  
+        end script
+       '';
+    }];
+  };
 }

upstart-jobs/default.nix

@@ -68,13 +68,7 @@ let
 
   requiredTTYs = config.requiredTTYs;
 
-  jobs = map makeJob
-    ([
-    
-    # Ctrl-alt-delete action.
-    (import ../upstart-jobs/ctrl-alt-delete.nix)
-
-  ])
+  jobs = map makeJob []
 
   # ifplugd daemon for monitoring Ethernet cables.
   ++ optional config.networking.interfaceMonitor.enable