From 76f7978cc60cfa592a4ae3b12ce01cc0d2582122 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 6 Mar 2009 12:27:45 +0000
Subject: [PATCH] Convert "ctrl-alt-delete"

svn path=/nixos/branches/fix-style/; revision=14406
---
 system/options.nix               |  2 ++
 upstart-jobs/ctrl-alt-delete.nix | 28 ++++++++++++++++++----------
 upstart-jobs/default.nix         |  8 +-------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index df77eeb1a346..6b24af8309fa 100644
--- a/system/options.nix
+++ b/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)
diff --git a/upstart-jobs/ctrl-alt-delete.nix b/upstart-jobs/ctrl-alt-delete.nix
index 126154bae733..6f58606b5cdd 100644
--- a/upstart-jobs/ctrl-alt-delete.nix
+++ b/upstart-jobs/ctrl-alt-delete.nix
@@ -1,12 +1,20 @@
-{
-  name = "ctrl-alt-delete";
-  
-  job = "
-on ctrlaltdel
+{pkgs, config, ...}:
 
-script
-    shutdown -r now 'Ctrl-Alt-Delete pressed'
-end script
-  ";
-  
+###### implementation
+
+{
+
+  services = {
+    extraJobs = [{
+      name = "ctrl-alt-delete";
+      
+      job = ''
+        on ctrlaltdel
+        
+        script
+            shutdown -r now 'Ctrl-Alt-Delete pressed'
+        end script
+       '';
+    }];
+  };
 }
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 9aaa3e38f821..5db0ccdd5a52 100644
--- a/upstart-jobs/default.nix
+++ b/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