On Fri, Sep 14, 2012 at 11:09:27AM +0100, Richard W.M. Jones wrote:
From: "Richard W.M. Jones" <rjones(a)redhat.com>
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 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f47b06c..2a0e13b 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -662,8 +662,9 @@ 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,
ACK, but can you break the long line before pushing like this
_("Unable to locate libvirtd daemon in %s "
"(to override, set $LIBVIRTD_PATH to the "
"name of the libvirtd binary)"),
Daniel
--
|:
http://berrange.com -o-
http://www.flickr.com/photos/dberrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|:
http://entangle-photo.org -o-
http://live.gnome.org/gtk-vnc :|