git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tunproxy
[sliver-openvswitch.git]
/
utilities
/
ovs-lib.in
diff --git
a/utilities/ovs-lib.in
b/utilities/ovs-lib.in
index
01f4ded
..
a441c3d
100644
(file)
--- a/
utilities/ovs-lib.in
+++ b/
utilities/ovs-lib.in
@@
-37,6
+37,11
@@
else
dbdir='@DBDIR@'
fi
dbdir='@DBDIR@'
fi
+ovs_ctl () {
+ echo "`date -u`:$@" >> "${logdir}/ovs-ctl.log"
+ "${datadir}/scripts/ovs-ctl" "$@" 2>&1 | tee -a "${logdir}/ovs-ctl.log"
+}
+
VERSION='@VERSION@'
DAEMON_CWD=/
VERSION='@VERSION@'
DAEMON_CWD=/
@@
-140,6
+145,9
@@
start_daemon () {
log_failure_msg "strace not installed, running $daemon without it"
fi
;;
log_failure_msg "strace not installed, running $daemon without it"
fi
;;
+ glibc)
+ set env MALLOC_CHECK_=2 MALLOC_PERTURB_=165 "$@"
+ ;;
'')
;;
*)
'')
;;
*)
@@
-164,7
+172,10
@@
start_daemon () {
stop_daemon () {
if test -e "$rundir/$1.pid"; then
if pid=`cat "$rundir/$1.pid"`; then
stop_daemon () {
if test -e "$rundir/$1.pid"; then
if pid=`cat "$rundir/$1.pid"`; then
- for action in TERM .1 .25 .65 1 1 1 1 KILL 1 1 1 1 FAIL; do
+ for action in TERM .1 .25 .65 1 1 1 1 KILL 1 1 1 2 10 15 30 FAIL; do
+ if pid_exists "$pid" >/dev/null 2>&1; then :; else
+ return 0
+ fi
case $action in
TERM)
action "Killing $1 ($pid)" kill $pid
case $action in
TERM)
action "Killing $1 ($pid)" kill $pid
@@
-177,11
+188,7
@@
stop_daemon () {
return 1
;;
*)
return 1
;;
*)
- if pid_exists $pid >/dev/null 2>&1; then
- sleep $action
- else
- return 0
- fi
+ sleep $action
;;
esac
done
;;
esac
done