Merge "base run.sh: simplify CONTROLLER_RUNSH definition"

diff --git a/distributions/virtualization/src/assemble/resources/run.sh b/distributions/virtualization/src/assemble/resources/run.sh
index aa7a21ebfeffefb923396ac05a332b3cc1614fa5..c6e1652a84d7395b10d9f767e826d4f2203b3e75 100755 (executable)
--- a/distributions/virtualization/src/assemble/resources/run.sh
+++ b/distributions/virtualization/src/assemble/resources/run.sh
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+# Use same path for run.base.sh
+RUNSH_DIR=$(dirname $0)
+RUN_BASE_SH=${RUNSH_DIR}/run.base.sh
+
 function usage {
-    echo "Please select one of the 3 supported Virtualization technology : \"$0 -virt [ovsdb | opendove | vtn]\""
+    echo -e "You must select one of the 3 supported network virtualization technologies:\n\tovsdb | opendove | vtn"
+    echo "Usage: $0 -virt {ovsdb | opendove | vtn} [advanced options]"
+    echo "Advanced options: $($RUN_BASE_SH -help | sed "s;Usage: $RUN_BASE_SH ;;")"
     exit 1
 }
 
@@ -34,4 +40,4 @@ else
     fi
 fi
 
-./run.base.sh -bundlefilter "org.opendaylight.(${ODL_VIRT_FILTER})" "${@:1:$virtIndex-1}" "${@:virtIndex+2}"
+$RUN_BASE_SH -bundlefilter "org.opendaylight.(${ODL_VIRT_FILTER})" "${@:1:$virtIndex-1}" "${@:virtIndex+2}"