Commit 62407561 authored by Lionel Gauthier's avatar Lionel Gauthier

Should be good.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4931 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent a0ac354e
...@@ -13,7 +13,9 @@ linux-headers-`uname -r` vlan -y ...@@ -13,7 +13,9 @@ linux-headers-`uname -r` vlan -y
rmmod bridge rmmod bridge
cd /usr/local/src/ cd /usr/local/src/
wget http://openvswitch.org/releases/openvswitch-1.9.0.tar.gz if [ ! -f /usr/local/src/openvswitch-1.9.0.tar.gz ]; then
wget http://openvswitch.org/releases/openvswitch-1.9.0.tar.gz
fi
tar -xzf openvswitch-1.9.0.tar.gz tar -xzf openvswitch-1.9.0.tar.gz
cd openvswitch-1.9.0 cd openvswitch-1.9.0
./boot.sh ./boot.sh
...@@ -27,7 +29,7 @@ if [ -f /lib/modules/`uname -r`/kernel/net/openvswitch/openvswitch.ko ] ; then ...@@ -27,7 +29,7 @@ if [ -f /lib/modules/`uname -r`/kernel/net/openvswitch/openvswitch.ko ] ; then
else else
if [ -f /lib/modules//`uname -r`/extra/openvswitch.ko ] ; then if [ -f /lib/modules//`uname -r`/extra/openvswitch.ko ] ; then
insmod /lib/modules//`uname -r`/extra/openvswitch.ko insmod /lib/modules//`uname -r`/extra/openvswitch.ko
else else
echo_error "Could not find openvswitch.ko, exiting" echo_error "Could not find openvswitch.ko, exiting"
exit 1 exit 1
fi fi
...@@ -56,7 +58,7 @@ ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:O ...@@ -56,7 +58,7 @@ ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:O
ovs-vsctl --no-wait init ovs-vsctl --no-wait init
# Then start the main Open vSwitch daemon, telling it to # Then start the main Open vSwitch daemon, telling it to
# connect to the same Unix domain socket: # connect to the same Unix domain socket:
ovs-vswitchd --pidfile --detach ovs-vswitchd --pidfile --detach
......
...@@ -61,6 +61,10 @@ then ...@@ -61,6 +61,10 @@ then
done done
fi fi
# May we have booted on a new kernel, not the one when we build vswitch kernel module
if [ ! -f /lib/modules/`uname -r`/extra/openvswitch.ko ]; then
$OPENAIRCN_DIR/SCRIPTS/install_openvswitch1.9.0.bash
fi
IPTABLES=`which iptables` IPTABLES=`which iptables`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment