* Quick hack to make sure that acpid starts before hal.

svn path=/nixos/trunk/; revision=14139
2009-02-20 15:11:07 +00:00 · 2009-02-20 15:11:07 +00:00 · 049c60e8c0
commit 049c60e8c0
parent e9b6d417a6
2 changed files with 3 additions and 2 deletions
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@ -363,6 +363,7 @@ let
  ++ optional config.services.hal.enable
    (import ../upstart-jobs/hal.nix {
      inherit (pkgs) stdenv hal;
+      inherit config;
    })

  ++ optional config.services.gpm.enable 
--- a/upstart-jobs/hal.nix
+++ b/upstart-jobs/hal.nix
@ -1,4 +1,4 @@
-{stdenv, hal}:
+{stdenv, hal, config}:

 {
  name = "hal";
@ -23,7 +23,7 @@

    # !!! TODO: make sure that HAL starts after acpid,
    # otherwise hald-addon-acpi will grab /proc/acpi/event.
-    start on dbus
+    start on ${if config.powerManagement.enable then "acpid" else "dbus"}
    stop on shutdown

    start script