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
use ovs_assert instead of assert
[sliver-openvswitch.git]
/
utilities
/
ovs-lib.in
diff --git
a/utilities/ovs-lib.in
b/utilities/ovs-lib.in
index
3905a84
..
b787b1c
100644
(file)
--- a/
utilities/ovs-lib.in
+++ b/
utilities/ovs-lib.in
@@
-28,8
+28,19
@@
datadir=${OVS_PKGDATADIR-'@pkgdatadir@'} # /usr/share/openvswitch
bindir=${OVS_BINDIR-'@bindir@'} # /usr/bin
sbindir=${OVS_SBINDIR-'@sbindir@'} # /usr/sbin
bindir=${OVS_BINDIR-'@bindir@'} # /usr/bin
sbindir=${OVS_SBINDIR-'@sbindir@'} # /usr/sbin
+# /etc/openvswitch or /var/lib/openvswitch
+if test X"$OVS_DBDIR" != X; then
+ dbdir=$OVS_DBDIR
+elif test X"$OVS_SYSCONFDIR" != X; then
+ dbdir=$OVS_SYSCONFDIR/openvswitch
+else
+ dbdir='@DBDIR@'
+fi
+
VERSION='@VERSION@'
VERSION='@VERSION@'
+DAEMON_CWD=/
+
LC_ALL=C; export LC_ALL
## ------------- ##
LC_ALL=C; export LC_ALL
## ------------- ##
@@
-129,6
+140,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 "$@"
+ ;;
'')
;;
*)
'')
;;
*)
@@
-150,7
+164,6
@@
start_daemon () {
fi
}
fi
}
-DAEMON_CWD=/
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