From 9650b0859eb17279060f3db1d9f123dd58f4050b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 6 Mar 2008 20:56:50 +0000
Subject: [PATCH] Fix `avahi-daemon' Upstart job.

svn path=/nixos/trunk/; revision=11002
---
 upstart-jobs/avahi-daemon.nix | 8 ++++++--
 upstart-jobs/default.nix      | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/avahi-daemon.nix b/upstart-jobs/avahi-daemon.nix
index 481bdb712bb..8ec26c9826e 100644
--- a/upstart-jobs/avahi-daemon.nix
+++ b/upstart-jobs/avahi-daemon.nix
@@ -16,8 +16,6 @@ let
     disable-publishing=${if publishing then "no" else "yes"}
   '';
 
-  avahiUid = (import ../system/ids.nix).uids.avahi;
-
 in
 
 {
@@ -31,6 +29,12 @@ in
     }
   ];
 
+  groups = [
+    { name = "avahi";
+      gid = (import ../system/ids.nix).gids.avahi;
+    }
+  ];
+
   job = ''
     start on startup
     stop on shutdown
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index fcf15c74a5d..fd132621b82 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -277,7 +277,8 @@ let
     (import ../upstart-jobs/dbus.nix {
       inherit (pkgs) stdenv dbus;
       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.