From a83e308856b51dfe98def2b50a17dc7af96848f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Sep 2009 23:18:52 +0000
Subject: [PATCH] * Clean up ConsoleKit.

svn path=/nixos/trunk/; revision=17434
---
 modules/services/system/dbus.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index febf5f44b37f..44d186dd54e9 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -138,7 +138,14 @@ in
           ''
             pid=$(cat ${homeDir}/pid)
             if test -n "$pid"; then
-                kill -9 $pid
+                kill $pid
+            fi
+
+            # !!! Hack: doesn't belong here.
+            pid=$(cat /var/run/ConsoleKit/pid)
+            if test -n "$pid"; then
+                kill $pid
+                rm /var/run/ConsoleKit/pid
             fi
           '';
       };