diff --git a/openair-cn/SCRIPTS/install_openvswitch1.9.0.bash b/openair-cn/SCRIPTS/install_openvswitch1.9.0.bash index cb32561d8d..bc044f0883 100755 --- a/openair-cn/SCRIPTS/install_openvswitch1.9.0.bash +++ b/openair-cn/SCRIPTS/install_openvswitch1.9.0.bash @@ -1,5 +1,5 @@ #!/bin/bash -# Tested on ubuntu 12.04 with updates on 05 april 2013, 07 november 2013 +# Tested on ubuntu 12.04 with updates on 05 april 2013, 07 november 2013, 20 january 2014 # Make sure only root can run our script if [[ $EUID -ne 0 ]]; then @@ -22,8 +22,16 @@ make make install make modules_install -insmod /lib/modules/`uname -r`/kernel/net/openvswitch/openvswitch.ko - +if [ -f /lib/modules/`uname -r`/kernel/net/openvswitch/openvswitch.ko ] ; then + insmod /lib/modules/`uname -r`/kernel/net/openvswitch/openvswitch.ko +else + if [ -f /lib/modules//`uname -r`/extra/openvswitch.ko ] ; then + insmod /lib/modules//`uname -r`/extra/openvswitch.ko + else + echo_error "Could not find openvswitch.ko, exiting" + exit 1 + fi +fi # Initialize the configuration database using ovsdb-tool, e.g.: mkdir -p /usr/local/etc/openvswitch diff --git a/openair-cn/SCRIPTS/start_lte-epc-ovs.bash b/openair-cn/SCRIPTS/start_lte-epc-ovs.bash index e4e6e4d860..ce848fe3c1 100755 --- a/openair-cn/SCRIPTS/start_lte-epc-ovs.bash +++ b/openair-cn/SCRIPTS/start_lte-epc-ovs.bash @@ -80,14 +80,14 @@ then cd ./$OBJ_DIR fi else - OBJ_DIR="OBJS" + OBJ_DIR="objs" bash_exec "mkdir -m 777 ./$OBJ_DIR" echo_success "Created $OBJ_DIR directory" echo_success "Invoking autogen" bash_exec "./autogen.sh" cd ./$OBJ_DIR echo_success "Invoking configure" - ../configure --enable-standalone-epc --disable-nas LDFLAGS=-L/usr/local/lib + ../configure --enable-standalone-epc LDFLAGS=-L/usr/local/lib fi if [ -f Makefile ] then @@ -132,7 +132,7 @@ else fi ####################################################### -# SOURCE $OPENAIRCN_DIR/UTILS/CONF/epc_$HOSTNAME.conf +# SOURCE $OPENAIRCN_DIR/UTILS/CONF/enb_$HOSTNAME.conf ####################################################### rm -f /tmp/source.txt if [ -f $OPENAIRCN_DIR/UTILS/CONF/enb_$HOSTNAME.conf ] @@ -185,8 +185,8 @@ echo " Disabling reverse path filtering" bash_exec "sysctl -w net.ipv4.conf.all.rp_filter=0" assert " `sysctl -n net.ipv4.conf.all.rp_filter` -eq 0" $LINENO -echo_warning "LG FORCED EXIT" -exit +#echo_warning "LG FORCED EXIT" +#exit start_openswitch_daemon # REMINDER: @@ -374,6 +374,6 @@ bash_exec "ip link set $PGW_INTERFACE_NAME_FOR_SGI promisc on" # LAUNCH MME + S+P-GW executable ################################################## - -gdb --args $OPENAIR3_DIR/OPENAIRMME/objs/OAI_EPC/oai_epc -c $OPENAIR3_DIR/OPENAIRMME/UTILS/CONF/mme_default.conf +cd $OPENAIRCN_DIR/$OBJ_DIR +gdb --args $OPENAIRCN_DIR/$OBJ_DIR/OAI_EPC/oai_epc -c $OPENAIRCN_DIR/UTILS/CONF/mme_default.conf wait_process_started "oai_epc" diff --git a/openair-cn/SCRIPTS/utils.bash b/openair-cn/SCRIPTS/utils.bash index 536a04dd3d..91039cb776 100755 --- a/openair-cn/SCRIPTS/utils.bash +++ b/openair-cn/SCRIPTS/utils.bash @@ -228,7 +228,7 @@ test_command_install_script() { start_openswitch_daemon() { rmmod -s bridge if [[ -e "/lib/modules/`uname -r`/extra/openvswitch.ko" ]] ; then - bash_exec "insmod /lib/modules/`uname -r`/extra/openvswitch.ko" + bash_exec "insmod /lib/modules/`uname -r`/extra/openvswitch.ko" > /dev/null 2>&1 else echo_error "/lib/modules/`uname -r`/extra/openvswitch.ko not found, exiting" exit -1