Bug fixes.

1 files changed, 9 insertions, 9 deletions

diff --git a/vde/build/rc.vdenetwork b/vde/build/rc.vdenetwork
index 194b9c08..22a511c8 100755
--- a/vde/build/rc.vdenetwork
+++ b/vde/build/rc.vdenetwork
@@ -21,7 +21,7 @@ TAP_MASK=255.255.255.0
 
 TAP_BCAST=`/bin/ipmask ${TAP_MASK} ${TAP_IP} | cut -f 1 -d ' '`
 
-# Host interfaces that need to be NAT-ed (in case we're nog bridging):
+# Host interfaces that need to be NAT-ed (in case we're not bridging):
 NAT_IFS="eth+"
 
 # Definitions for the LAN segment the Qemu virtual machines will be in.
@@ -48,15 +48,14 @@ case "$1" in
   start)
         echo -n "Starting VDE network for QEMU: "
 
-        # If we are running 2.6, load tun module
-        if uname -r | grep '^2.6'; then
-          /sbin/modprobe tun 2>/dev/null
-          # Wait for the module to be loaded
-          while ! /bin/lsmod |grep -q "^tun"; do echo Waiting for tun device;sleep 1; done
-        fi
+        # Load tun module
+        /sbin/modprobe tun 2>/dev/null
+        # Wait for the module to be loaded
+        while ! /bin/lsmod |grep -q "^tun"; do echo Waiting for tun device;sleep 1; done
 
         # Start tap switch
         vde_switch -tap ${TAP_DEV} -daemon
+        sleep 1
 
         # Bring tap interface up
         ifconfig ${TAP_DEV} ${TAP_IP} broadcast ${TAP_BCAST} netmask ${TAP_MASK}
@@ -99,8 +98,9 @@ case "$1" in
         ifconfig ${TAP_DEV} down
         # Kill VDE switch
         pgrep -f vde_switch | xargs kill -TERM
-        # Remove the control socket
-        rm -f /tmp/vde.ctl
+        # Remove the control socket (vde2 uses a different location)
+        #rm -f /tmp/vde.ctl
+        rmdir /var/run/vde.ctl
         # Stop dnsmasq
         pgrep -f dnsmasq | xargs kill -TERM
         } >/dev/null 2>&1