diff --git a/mininet/node.py b/mininet/node.py index 8286466..3d598dd 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -601,7 +601,7 @@ class OVSKernelSwitch( Switch ): raise Exception( 'only contiguous, one-indexed port ranges ' 'supported: %s' % self.intfs ) intfs = [ self.intfs[ port ] for port in ports ] - self.cmd( 'ovs-dpctl', 'add-if', self.dp, ' '.join( intfs ) ) + self.cmdPrint( 'ovs-dpctl', 'add-if', self.dp, ' '.join( intfs ) ) # Run protocol daemon controller = controllers[ 0 ] self.cmd( 'ovs-openflowd ' + self.dp + diff --git a/util/install.sh b/util/install.sh index 1036603..9a80f8f 100755 --- a/util/install.sh +++ b/util/install.sh @@ -35,9 +35,8 @@ KERNEL_IMAGE_OLD=linux-image-2.6.26-2-686 DRIVERS_DIR=/lib/modules/${KERNEL_NAME}/kernel/drivers/net -#OVS_RELEASE=openvswitch-1.0.1 -OVS_RELEASE=openvswitch # release 1.0.1 doesn't work with veth pairs. -OVS_DIR=~/$OVS_RELEASE +OVS_RELEASE=v1.1.1 +OVS_DIR=~/openvswitch OVS_KMOD=openvswitch_mod.ko function kernel { @@ -161,7 +160,8 @@ function ovs { #Install OVS from release cd ~/ git clone git://openvswitch.org/openvswitch - cd $OVS_RELEASE + cd $OVS_DIR + git checkout $OVS_RELEASE ./boot.sh BUILDDIR=/lib/modules/${KERNEL_NAME}/build if [ ! -e $BUILDDIR ]; then