projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectors: Check for NULL set of collectors.
[openvswitch]
/
debian
/
openvswitch-switch.init
diff --git
a/debian/openvswitch-switch.init
b/debian/openvswitch-switch.init
index 5d37d7070b1bf7b6f6ca3cefb80e5069805e5174..3a7f2924406dfeba0b887e909f53fb8cd18fe19b 100755
(executable)
--- 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 OVSDB_SERVER_OPTS
unset OVS_VSWITCHD_OPTS
unset CORE_LIMIT
+unset ENABLE_MONITOR
default=/etc/default/openvswitch-switch
if [ -f $default ] ; then
. $default
fi
default=/etc/default/openvswitch-switch
if [ -f $default ] ; then
. $default
fi
+: ${ENABLE_MONITOR:=y}
+
set -e
# running_pid pid name
set -e
# running_pid pid name
@@
-206,14
+209,20
@@
case "$1" in
# Create configuration database.
ovsdb-tool -vANY:console:emer \
create /etc/openvswitch-switch/conf \
# Create configuration database.
ovsdb-tool -vANY:console:emer \
create /etc/openvswitch-switch/conf \
- /usr/share/openvswitch/vswitch-idl.ovsschema
+ /usr/share/openvswitch/vswitch.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
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
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 --
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: "
set -- "$@" unix:/var/run/ovsdb-server
set -- "$@" $OVS_VSWITCHD_OPTS
echo -n "Starting ovs-vswitchd: "