specifying the --db option to ovs-vsctl requires the unix: qualifier

diff --git a/planetlab/scripts/sliver-ovs b/planetlab/scripts/sliver-ovs
index aac0d7a..e25959b 100755 (executable)
--- a/planetlab/scripts/sliver-ovs
+++ b/planetlab/scripts/sliver-ovs
@@ -155,7 +155,7 @@ function create_bridge () {
     # check whether the address is already assigned
     TAPNAME=$(tapname $IP)
     if [ ! -z "$TAPNAME" ]; then
-       if ovs-vsctl --db=$DB_SOCKET br-exists "$TAPNAME"; then
+       if ovs-vsctl --db=unix:$DB_SOCKET br-exists "$TAPNAME"; then
            echo $TAPNAME
            exit 0
        fi
@@ -172,7 +172,7 @@ function create_bridge () {
        $PREFIX
 EOF
     wait_device $TAPNAME 60 && \
-       ovs-vsctl --db=$DB_SOCKET add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
+       ovs-vsctl --db=unix:$DB_SOCKET add-br $TAPNAME -- set bridge $TAPNAME datapath_type=planetlab
     echo $TAPNAME
     return 0
 }
@@ -185,8 +185,8 @@ function create_port () {
     [[ -n "$@" ]] || error "$COMMAND create-port <bridge> <port>"
 
     set -e
-    if ! ovs-vsctl --db=$DB_SOCKET list-ports "$bridge" | grep -q "^$port\$"; then
-       ovs-vsctl --db=$DB_SOCKET add-port "$bridge" "$port" -- set interface "$port" type=tunnel
+    if ! ovs-vsctl --db=unix:$DB_SOCKET list-ports "$bridge" | grep -q "^$port\$"; then
+       ovs-vsctl --db=unix:$DB_SOCKET add-port "$bridge" "$port" -- set interface "$port" type=tunnel
     fi
     ovs-appctl --target=$SWITCH_SOCKET netdev-tunnel/get-port "$port"
     return 0
@@ -202,8 +202,8 @@ function del_bridge () {
     W=
     is_switch_running || W="--no-wait"
 
-    if ovs-vsctl --db=$DB_SOCKET br-exists "$bridge_name"; then
-       ovs-vsctl --db=$DB_SOCKET $W del-br $bridge_name
+    if ovs-vsctl --db=unix:$DB_SOCKET br-exists "$bridge_name"; then
+       ovs-vsctl --db=unix:$DB_SOCKET $W del-br $bridge_name
     fi
     return 0
 }
@@ -214,8 +214,8 @@ function del_port () {
     [[ -n "$@" ]] && error "Usage: ${COMMAND} del-port <port>"
 
     set -e
-    if ovs-vsctl --db=$DB_SOCKET port-to-br "$1" >/dev/null 2>&1; then
-       ovs-vsctl --db=$DB_SOCKET del-port "$1"
+    if ovs-vsctl --db=unix:$DB_SOCKET port-to-br "$1" >/dev/null 2>&1; then
+       ovs-vsctl --db=unix:$DB_SOCKET del-port "$1"
     fi
     return 0
 }