* Clean up ConsoleKit.

svn path=/nixos/trunk/; revision=17434
2009-09-25 23:18:52 +00:00 · 2009-09-25 23:18:52 +00:00 · a83e308856
commit a83e308856
parent 69f68c319d
1 changed files with 8 additions and 1 deletions
--- 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
          '';
      };