projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Fix memory leak in --monitor implementation.
[openvswitch]
/
debian
/
openvswitch-switchui.init
diff --git
a/debian/openvswitch-switchui.init
b/debian/openvswitch-switchui.init
index 7a02c5eacf9b9f463f8231ccc3d22d3ae0e36518..7ecb14ae123a20b4d0e252b568f27989ba1e1623 100755
(executable)
--- a/
debian/openvswitch-switchui.init
+++ b/
debian/openvswitch-switchui.init
@@
-56,7
+56,7
@@
DODTIME=10 # Time to wait for the server to die, in seconds
# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
-
. /etc/default/$NAME
+ . /etc/default/$NAME
fi
set -e
fi
set -e
@@
-99,10
+99,10
@@
start_server() {
# Wait up to 3 seconds for the daemon to start.
for i in 1 2 3; do
# Wait up to 3 seconds for the daemon to start.
for i in 1 2 3; do
- if running; then
-
break
-
fi
-
sleep 1
+
if running; then
+ break
+ fi
+ sleep 1
done
}
done
}
@@
-112,27
+112,27
@@
stop_server() {
force_stop() {
# Force the process to die killing it manually
force_stop() {
# Force the process to die killing it manually
-
[ ! -e "$PIDFILE" ] && return
-
if running ; then
-
kill -15 $pid
- # Is it really dead?
-
sleep "$DIETIME"s
-
if running ; then
-
kill -9 $pid
-
sleep "$DIETIME"s
-
if running ; then
-
echo "Cannot kill $NAME (pid=$pid)!"
-
exit 1
-
fi
-
fi
-
fi
-
rm -f $PIDFILE
+ [ ! -e "$PIDFILE" ] && return
+ if running ; then
+ kill -15 $pid
+
# Is it really dead?
+ sleep "$DIETIME"s
+ if running ; then
+ kill -9 $pid
+ sleep "$DIETIME"s
+ if running ; then
+ echo "Cannot kill $NAME (pid=$pid)!"
+ exit 1
+ fi
+ fi
+ fi
+ rm -f $PIDFILE
}
case "$1" in
start)
}
case "$1" in
start)
- log_daemon_msg "Starting $DESC " "$NAME"
+
log_daemon_msg "Starting $DESC " "$NAME"
# Check if it's running first
if running ; then
log_progress_msg "apparently already running"
# Check if it's running first
if running ; then
log_progress_msg "apparently already running"
@@
-150,7
+150,7
@@
case "$1" in
# a false positive (use 'status' for that)
log_end_msg 1
fi
# a false positive (use 'status' for that)
log_end_msg 1
fi
- ;;
+
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if running ; then
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if running ; then
@@
-173,7
+173,7
@@
case "$1" in
force_stop
log_end_msg $?
fi
force_stop
log_end_msg $?
fi
- ;;
+
;;
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
stop_server
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
stop_server
@@
-182,7
+182,7
@@
case "$1" in
start_server
running
log_end_msg $?
start_server
running
log_end_msg $?
- ;;
+
;;
status)
log_daemon_msg "Checking status of $DESC" "$NAME"
status)
log_daemon_msg "Checking status of $DESC" "$NAME"
@@
-201,10
+201,10
@@
case "$1" in
log_warning_msg "cannot re-read the config file (use restart)."
;;
*)
log_warning_msg "cannot re-read the config file (use restart)."
;;
*)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
- exit 1
- ;;
+
N=/etc/init.d/$NAME
+
echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+
exit 1
+
;;
esac
exit 0
esac
exit 0