On 04/25/2014 05:28 AM, Daniel P. Berrange wrote:
Make the lock plugin use virFileFindResource to find the virtlockd daemon path, so that it executes the in-builddir daemon if run from source tree.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- src/locking/lock_driver_lockd.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
-static const char * -virLockManagerLockDaemonFindDaemon(void) -{ - const char *customDaemon = virGetEnvBlockSUID("VIRTLOCKD_PATH"); - - if (customDaemon) - return customDaemon; -
As in 1/3, this is a change in semantics, where VIRTLOCKD_PATH used to be "/path/to/virtlockd" and is now "/path/to"; but was otherwise undocumented. ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org