Added console kit upstart job

svn path=/nixos/trunk/; revision=14839

system/options.nix

@@ -1967,7 +1967,17 @@ in
       };
     };
 
-
+    consolekit = {
+    
+      enable = mkOption {
+        default = false;
+        description = "
+          Whether to start the ConsoleKit daemon.
+        ";
+      };
+          
+    };
+    
     samba = {
 
       enable = mkOption {

upstart-jobs/consolekit.nix

@@ -0,0 +1,24 @@
+args: with args;
+
+let
+
+cfg = config.services.consolekit;
+
+in
+{
+    name = "consolekit";
+        
+    job = ''
+      description "Console Kit Service"
+
+      start on dbus
+      stop on shutdown  
+          
+      start script
+        # !!! quick hack: wait until dbus has started
+        sleep 3
+      end script
+      
+      respawn ${pkgs.ConsoleKit}/sbin/console-kit-daemon
+    '';
+}

upstart-jobs/default.nix

@@ -350,6 +350,7 @@ let
       dbusServices =
         pkgs.lib.optional config.services.hal.enable pkgs.hal ++
         pkgs.lib.optional config.services.avahi.enable pkgs.avahi ++
+	pkgs.lib.optional config.services.consolekit.enable pkgs.ConsoleKit ++
         pkgs.lib.optional config.services.disnix.enable pkgs.disnix
         ;
     })
@@ -385,6 +386,12 @@ let
       inherit config pkgs;
     })
   
+  # ConsoleKit daemon.
+  ++ optional config.services.consolekit.enable
+    (import ../upstart-jobs/consolekit.nix {
+      inherit config pkgs;
+    })
+  
   # Postfix mail server.
   ++ optional config.services.postfix.enable
     (import ../upstart-jobs/postfix.nix {