From 7aecd0ca53d28a0398020907df50e4c7e694bb16 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 7 Nov 2009 12:01:12 +0000
Subject: [PATCH] * hal: depend on both dbus and acpid (if enabled). * dbus:
 don't signal Upstart, since that seems to make it forget about   pending
 events or something.  In any case starting dbus after acpid   was running
 wouldn't trigger hal to be started (but the other way   around did work).

svn path=/nixos/branches/upstart-0.6/; revision=18251
---
 modules/services/hardware/hal.nix | 4 +---
 modules/services/system/dbus.nix  | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/services/hardware/hal.nix b/modules/services/hardware/hal.nix
index 9ee16cedf874..6c0332566335 100644
--- a/modules/services/hardware/hal.nix
+++ b/modules/services/hardware/hal.nix
@@ -67,9 +67,7 @@ in
     jobs.hal =
       { description = "HAL daemon";
         
-        # !!! TODO: make sure that HAL starts after acpid,
-        # otherwise hald-addon-acpi will grab /proc/acpi/event.
-        startOn = if config.powerManagement.enable then "started acpid" else "started dbus";
+        startOn = "started dbus" + optionalString config.powerManagement.enable " and started acpid";
 
         environment =
           { # !!! HACK? These environment variables manipulated inside
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 6f79865645db..b0c8dc66ae50 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -130,12 +130,6 @@ in
 
         exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
 
-        postStart =
-          ''
-            # Signal Upstart that it can connect to the system bus.
-            kill -HUP 1 || true
-          '';
-
         postStop =
           ''
             # !!! Hack: doesn't belong here.