Fixes for exolobe2

1 files changed, 26 insertions, 17 deletions

diff --git a/create-vm b/create-vm
index 92bd0ee..57d3206 100755
--- a/create-vm
+++ b/create-vm
@@ -57,23 +57,32 @@ virt-install --connect qemu:///system \
              --import \
              --os-variant=debianwheezy \
              --disk="path=$lvpath,cache=none" \
-             --network=network=default \
+             --network="$vmnetwork" \
              --graphics=spice \
              --noautoconsole
 
-# Get the MAC address.
-mac="$(virsh -c qemu:///system dumpxml "$name" |
-       sed -n "/<mac address=/s/^.*'\(.*\)'.*/\1/p")"
-
-# Get IP address related to the MAC address. Append that to /etc/hosts.
-leases=/var/lib/libvirt/dnsmasq/default.leases
-ip=""
-while [ "$ip" = "" ]
-do
-    sleep 1
-    ip="$(awk -v "mac=$mac" '$2 == mac { print $3 }' "$leases")"
-done
-echo "$ip $name" | sudo tee -a /etc/hosts > /dev/null
-
-# Done.
-echo "Virtual machine $name ($ip) has been created and started."
+# If we're using the virtual network "default", wait for the VM to get
+# a DHCP response and add it to /etc/hosts. We don't do it for other
+# types of network (e.g., bridge=br0), since we ... can't.
+
+if [ "$vmnetwork" = "network=default" ]
+then
+    # Get the MAC address.
+    mac="$(virsh -c qemu:///system dumpxml "$name" |
+           sed -n "/<mac address=/s/^.*'\(.*\)'.*/\1/p")"
+
+    # Get IP address related to the MAC address. Append that to /etc/hosts.
+    leases=/var/lib/libvirt/dnsmasq/default.leases
+    ip=""
+    while [ "$ip" = "" ]
+    do
+        sleep 1
+        ip="$(awk -v "mac=$mac" '$2 == mac { print $3 }' "$leases")"
+    done
+    echo "$ip $name" | sudo tee -a /etc/hosts > /dev/null
+
+    # Done.
+    echo "Virtual machine $name ($ip) has been created and started."
+else
+    echo "Virtual machien $name has been created and started, and may be ready soon."
+fi