diff options
Diffstat (limited to 'debian/openvswitch-switch.init')
-rwxr-xr-x | debian/openvswitch-switch.init | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index 5d37d707..1f65b693 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -33,11 +33,14 @@ DODTIME=1 # Time to wait for the server to die, in seconds unset OVSDB_SERVER_OPTS unset OVS_VSWITCHD_OPTS unset CORE_LIMIT +unset ENABLE_MONITOR default=/etc/default/openvswitch-switch if [ -f $default ] ; then . $default fi +: ${ENABLE_MONITOR:=y} + set -e # running_pid pid name @@ -209,11 +212,17 @@ case "$1" in /usr/share/openvswitch/vswitch-idl.ovsschema fi + if test "$ENABLE_MONITOR" = y; then + monitor_opt=--monitor + else + monitor_opt= + fi + # Start ovsdb-server. set -- set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err set -- "$@" --log-file - set -- "$@" --detach --pidfile + set -- "$@" --detach --pidfile $monitor_opt set -- "$@" --remote punix:/var/run/ovsdb-server set -- "$@" /etc/openvswitch-switch/conf set -- "$@" $OVSDB_SERVER_OPTS @@ -232,7 +241,7 @@ case "$1" in set -- set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err set -- "$@" --log-file - set -- "$@" --detach --pidfile + set -- "$@" --detach --pidfile $monitor_opt set -- "$@" unix:/var/run/ovsdb-server set -- "$@" $OVS_VSWITCHD_OPTS echo -n "Starting ovs-vswitchd: " |