Skip to content
This repository has been archived by the owner on Nov 13, 2023. It is now read-only.

Escapes FV_JVM_ARGS in flowvisor.sh #270

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions scripts/flowvisor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ -z "$FV_RUN_AS_ROOT" -o "x$FV_RUN_AS_ROOT" != "xyes" ]; then
exit 1
fi
fi


if [ -z $base ] ; then
envs=`dirname $0`/../scripts/envs.sh
Expand All @@ -27,16 +27,16 @@ fi
default_jvm_args="-server -Xms100M -Xmx2000M -XX:OnError=flowvisor-crash-logger -XX:+UseConcMarkSweepGC $fv_defines"


if [ -z $FV_JVM_ARGS ]; then
if [ -z "$FV_JVM_ARGS" ]; then
export FV_JVM_ARGS="$default_jvm_args"
fi

if [ ! -z $FV_DEBUG_PORT ] ; then
# Checkout http://java.dzone.com/articles/how-debug-remote-java-applicat for
# Checkout http://java.dzone.com/articles/how-debug-remote-java-applicat for
# remote debugging details in java
FV_JVM_ARGS="$FV_JVM_ARGS -Xdebug -Xrunjdwp:transport=dt_socket,suspend=n,address=$FV_DEBUG_PORT,server=y"
fi

echo Starting FlowVisor >&2
echo Starting FlowVisor >&2
#echo Running with FV_JVM_ARGS=$FV_JVM_ARGS >&2
exec java $FV_JVM_ARGS $fv_defines $sslopts -cp $classpath org.flowvisor.FlowVisor "$@"
exec java $FV_JVM_ARGS $fv_defines $sslopts -cp $classpath org.flowvisor.FlowVisor "$@"