From 5eeb01d5ef172d613e0268077447b0eabf573d87 Mon Sep 17 00:00:00 2001
From: Dor Laor <dor@qumranet.com>
Date: Sun, 22 Oct 2006 12:18:05 +0000
Subject: [PATCH] Qemu network brdige: Mminor adjustments so it will work
 without dhcp too

---
 kvm/scripts/kvm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/kvm/scripts/kvm b/kvm/scripts/kvm
index ed9037ab8e..79badbd813 100755
--- a/kvm/scripts/kvm
+++ b/kvm/scripts/kvm
@@ -20,16 +20,15 @@ fi
 
 get_ip_info() {
     addr=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
+    gateway=$(ip route list | awk '/^default / { print $3 }')
 }
     
 do_ifup() {
-    if ! ifup $1 ; then
-        if [ ${addr} ] ; then
-            ip addr flush $1 >/dev/null 2>&1
-            ip addr add ${addr} dev $1 >/dev/null 2>&1
-            ip link set dev $1 up >/dev/null 2>&1
-        fi
-    fi
+     if [ ${addr} ] ; then
+        ip addr flush $1 
+        ip addr add ${addr} dev $1 
+        ip link set dev $1 up 
+     fi
 }
 
 link_exists()
@@ -110,8 +109,11 @@ change_ips() {
         dhclient ${dst} >/dev/null 2>&1
     else
         get_ip_info ${src}
+        ifdown ${src} >/dev/null 2>&1 || true
+        ip link set ${src} up >/dev/null 2>&1
         do_ifup ${dst}
         transfer_routes ${src} ${dst}
+        ip route add default via ${gateway} dev ${dst}
     fi
 }
                
-- 
2.11.4.GIT