NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106 from sciurus/libvirt_ip_command

Browse Source 
Use find utility in libvirt ip command
This commit is contained in:
Dmitry Vasilets
2013-12-16 11:07:18 -08:00
parent e9bc5bf194 5708442940
commit e17ad425b9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vagrant-libvirt/action/connect_libvirt.rb
View File

@@ -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}) ...")