]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
daemon: Fix error message when libvirtd is missing.
authorRichard W.M. Jones <rjones@redhat.com>
Fri, 14 Sep 2012 09:32:18 +0000 (10:32 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Tue, 18 Sep 2012 09:28:02 +0000 (10:28 +0100)
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).

src/remote/remote_driver.c

index 2f04a32a011cd57e19f3baf5ecac6f39302e4a36..dce12e2c933e168eed6d93c8f36b9a01afa1ab7c 100644 (file)
@@ -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,