On Fri, Apr 25, 2014 at 10:52:23AM -0600, Eric Blake wrote:
On 04/25/2014 08:25 AM, Daniel P. Berrange wrote:
On Fri, Apr 25, 2014 at 08:01:58AM -0600, Eric Blake wrote:
On 04/25/2014 05:28 AM, Daniel P. Berrange wrote:
Make the remote driver use virFileFindResource to find the libvirt daemon path, so that it executes the in-builddir daemon if run from source tree.
the new code assumes LIBVIRTD_PATH provides "/path/to" which contains libvirtd.
Don't know how many users this will impact, but the only former documentation of LIBVIRTD_PATH was in the error message. I can live with the change in semantics, since it is not formally documented on the web page as something users would normally fiddle with.
The 'run' script uses this, but we can just delete those lines from the 'run' script now, since we'll "do the right thing" automatically
In fact, you HAVE to fix the run script, or using it will break :) (I just tested it now, on a virgin VM with no libvirt installed and just an in-tree build: 'tools/virsh list' works now where it previously didn't, but without a tweak to run.in, './run tools/virsh list' started failing.
So amendment to my earlier posting: my ACK is conditional on this being squashed in (and similarly for 2/3):
diff --git i/run.in w/run.in index 2211f24..c8f12a5 100644 --- i/run.in +++ w/run.in @@ -1,6 +1,6 @@ #!/bin/sh # libvirt 'run' programs locally script -# Copyright (C) 2012-2013 Red Hat, Inc. +# Copyright (C) 2012-2014 Red Hat, Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -56,7 +56,6 @@ export LD_LIBRARY_PATH export LIBVIRT_DRIVER_DIR="$b/src/.libs" export LIBVIRT_LOCK_MANAGER_PLUGIN_DIR="$b/src/.libs" export VIRTLOCKD_PATH="$b/src/virtlockd" -export LIBVIRTD_PATH="$b/daemon/libvirtd"
We actually don't want to delete it because this script serves dual purposes. It is supposed to be usable for running apps outside libvirt. ie ./run virt-manager Such apps won't trigger the automatic path change, so we must just just alter the env var, not delete it Regards, 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 :|