* 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
This commit is contained in:
parent
7d47575a58
commit
7aecd0ca53
@ -67,9 +67,7 @@ in
|
|||||||
jobs.hal =
|
jobs.hal =
|
||||||
{ description = "HAL daemon";
|
{ description = "HAL daemon";
|
||||||
|
|
||||||
# !!! TODO: make sure that HAL starts after acpid,
|
startOn = "started dbus" + optionalString config.powerManagement.enable " and started acpid";
|
||||||
# otherwise hald-addon-acpi will grab /proc/acpi/event.
|
|
||||||
startOn = if config.powerManagement.enable then "started acpid" else "started dbus";
|
|
||||||
|
|
||||||
environment =
|
environment =
|
||||||
{ # !!! HACK? These environment variables manipulated inside
|
{ # !!! HACK? These environment variables manipulated inside
|
||||||
|
@ -130,12 +130,6 @@ in
|
|||||||
|
|
||||||
exec = "${dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf";
|
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 =
|
postStop =
|
||||||
''
|
''
|
||||||
# !!! Hack: doesn't belong here.
|
# !!! Hack: doesn't belong here.
|
||||||
|
Loading…
Reference in New Issue
Block a user