* Improve error message when /etc/avahi/services is not available

* improve INSTALL file

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@138 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/INSTALL b/INSTALL
index a004758ee4d97bc857db2d2aa80e2aa27b4e5be2..5db55458118cd2c00efc5048c3a063ce421767ae 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,27 @@
-* Quick install instructions (tested on debian/ubuntu only!)
-./bootstrap.sh
-./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-make
-make install
-/etc/init.d/dbus-1 restart
-
-* Note:
-On other linux distributions, the dbus initscript may be different (eg redhat /etc/init.d/messagebus).
-You need to restart dbus to make it knows about /etc/dbus-1/system.d/avahi-dbus.conf .
\ No newline at end of file
+*** Quick install instructions (tested on debian/ubuntu only!) ***
+
+$ ./bootstrap.sh
+       (this will run autoconf/automake and finally ./configure
+       --prefix=/usr --sysconfdir=/etc --localstatedir=/var)
+
+$ make
+# make install
+
+# addgroup --system avahi
+# adduser --system --no-create-home --ingroup avahi avahi
+       (These commands are Debian specific and may be different on other
+       distributions)
+
+# /etc/init.d/dbus-1 restart
+       (This whill restart DBUS and avahi too)
+
+While "make" and "boostrap.sh" may be run as normal users all other commands
+need to be run is root.
+
+*** Note ***
+
+On other linux distributions, the dbus initscript may be different (eg redhat
+/etc/init.d/messagebus).  You need to restart dbus to make it know about
+/etc/dbus-1/system.d/avahi-dbus.conf .
+
+$Id$

diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index 898edf3a2144a8f39d2cdaa8f97ff07dd98849b9..4e97299d99329ad853d8b68723bb1d5d38692fa7 100644 (file)
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -591,7 +591,7 @@ void static_service_load(void) {
 
     memset(&globbuf, 0, sizeof(globbuf));
     if (glob(AVAHI_SERVICE_DIRECTORY "/*.service", GLOB_ERR, NULL, &globbuf) != 0)
 
     memset(&globbuf, 0, sizeof(globbuf));
     if (glob(AVAHI_SERVICE_DIRECTORY "/*.service", GLOB_ERR, NULL, &globbuf) != 0)

-        avahi_log_error("glob() failed.\n");
+        avahi_log_error("Failed to read service directory.");

     else {
         for (p = globbuf.gl_pathv; *p; p++)
             load_file(*p);
     else {
         for (p = globbuf.gl_pathv; *p; p++)
             load_file(*p);