[DRE-commits] [vagrant-libvirt] 28/67: Use find utility in libvirt ip command

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.14
in repository vagrant-libvirt.

commit 5708442940640c85030b6f7679b23771e0eb4b19
Author: Brian Pitts <brian at polibyte.com>
Date:   Sun Dec 15 16:38:36 2013 -0600

    Use find utility in libvirt ip command
---
 lib/vagrant-libvirt/action/connect_libvirt.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/vagrant-libvirt/action/connect_libvirt.rb b/lib/vagrant-libvirt/action/connect_libvirt.rb
index 20f2cbc..575dd94 100644
--- a/lib/vagrant-libvirt/action/connect_libvirt.rb
+++ b/lib/vagrant-libvirt/action/connect_libvirt.rb
@@ -67,13 +67,11 @@ module VagrantPlugins
           conn_attr[:libvirt_password] = config.password if config.password
 
           # Setup command for retrieving IP address for newly created machine
-          # with some MAC address. Get it from dnsmasq leases table - either
-          # /var/lib/libvirt/dnsmasq/*.leases files, or
-          # /var/lib/misc/dnsmasq.leases if available.
-          ip_command =  "LEASES='/var/lib/libvirt/dnsmasq/*.leases'; "
-          ip_command << "[ -f /var/lib/misc/dnsmasq.leases ] && "
-          ip_command << "LEASES='/var/lib/misc/dnsmasq.leases'; "
+          # with some MAC address. Get it from dnsmasq leases table
+          ip_command =  "LEASES=$(find /var/lib/libvirt/dnsmasq/ /var/lib/misc/ -name '*leases');"
+          ip_command << "if [ -n $LEASES ]; then"
           ip_command << "grep $mac $LEASES | awk '{ print $3 }'"
+          ip_command << "fi"
           conn_attr[:libvirt_ip_command] = ip_command
 
           @logger.info("Connecting to Libvirt (#{uri}) ...")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git