JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* hal: depend on both dbus and acpid (if enabled).

Browse Source 
* 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
This commit is contained in:
Eelco Dolstra 2009-11-07 12:01:12 +00:00
parent 7d47575a58
commit 7aecd0ca53
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/hardware/hal.nix
View File

@ -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

6
modules/services/system/dbus.nix
View File

@ -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.