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

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

Browse Source 
svn path=/nixos/trunk/; revision=14139
This commit is contained in:
Eelco Dolstra 2009-02-20 15:11:07 +00:00
parent e9b6d417a6
commit 049c60e8c0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upstart-jobs/default.nix
View File

@ -363,6 +363,7 @@ let
++ optional config.services.hal.enable ++ optional config.services.hal.enable
(import ../upstart-jobs/hal.nix { (import ../upstart-jobs/hal.nix {
inherit (pkgs) stdenv hal; inherit (pkgs) stdenv hal;
inherit config;
}) })
++ optional config.services.gpm.enable ++ optional config.services.gpm.enable

4
upstart-jobs/hal.nix
View File

@ -1,4 +1,4 @@
{stdenv, hal}: {stdenv, hal, config}:
{ {
name = "hal"; name = "hal";
@ -23,7 +23,7 @@
# !!! TODO: make sure that HAL starts after acpid, # !!! TODO: make sure that HAL starts after acpid,
# otherwise hald-addon-acpi will grab /proc/acpi/event. # 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 stop on shutdown
start script start script