Fix `avahi-daemon' Upstart job.

svn path=/nixos/trunk/; revision=11002
This commit is contained in:
Ludovic Courtès 2008-03-06 20:56:50 +00:00
parent 43a4353c67
commit 9650b0859e
2 changed files with 8 additions and 3 deletions

View File

@ -16,8 +16,6 @@ let
disable-publishing=${if publishing then "no" else "yes"} disable-publishing=${if publishing then "no" else "yes"}
''; '';
avahiUid = (import ../system/ids.nix).uids.avahi;
in in
{ {
@ -31,6 +29,12 @@ in
} }
]; ];
groups = [
{ name = "avahi";
gid = (import ../system/ids.nix).gids.avahi;
}
];
job = '' job = ''
start on startup start on startup
stop on shutdown stop on shutdown

View File

@ -277,7 +277,8 @@ let
(import ../upstart-jobs/dbus.nix { (import ../upstart-jobs/dbus.nix {
inherit (pkgs) stdenv dbus; inherit (pkgs) stdenv dbus;
dbusServices = dbusServices =
pkgs.lib.optional (config.services.hal.enable) pkgs.hal; pkgs.lib.optional (config.services.hal.enable) pkgs.hal ++
pkgs.lib.optional (config.services.avahi.enable) pkgs.avahi;
}) })
# HAL daemon. # HAL daemon.