From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 14 Sep 2012 09:32:18 +0000 (+0100)
Subject: daemon: Fix error message when libvirtd is missing.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0e13136a2c713a92fa10501f5025c27fe2bd0133;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

daemon: Fix error message when libvirtd is missing.

Currently we search along the hard-coded names:
  SBINDIR "/libvirtd"
  SBINDIR "/libvirtd_dbg"
but if the environment variable $LIBVIRTD_PATH is set to the
name of the libvirtd binary, that is used instead.  Fix the
error message so it accurately reflects current behaviour
($PATH is NOT searched).
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 2f04a32a0..dce12e2c9 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -662,8 +662,11 @@ doRemoteOpen(virConnectPtr conn,
         }
 
         if (!(daemonPath = remoteFindDaemonPath())) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("Unable to locate libvirtd daemon in $PATH"));
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Unable to locate libvirtd daemon in %s "
+                             "(to override, set $LIBVIRTD_PATH to the "
+                             "name of the libvirtd binary)"),
+                           SBINDIR);
             goto failed;
         }
         if (!(priv->client = virNetClientNewUNIX(sockname,