projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Backport ip4_dst_hoplimit() from 2.6.38.
[openvswitch]
/
debian
/
openvswitch-controller.init
diff --git
a/debian/openvswitch-controller.init
b/debian/openvswitch-controller.init
index ad3547b10a876673abda0e34716d24fbd179bdde..4781f83f2148c747ed5c50f25931ec1165875100 100755
(executable)
--- a/
debian/openvswitch-controller.init
+++ b/
debian/openvswitch-controller.init
@@
-19,8
+19,8
@@
#
### BEGIN INIT INFO
# Provides: openvswitch-controller
#
### BEGIN INIT INFO
# Provides: openvswitch-controller
-# Required-Start: $network $local_fs
-# Required-Stop:
+# Required-Start: $network $local_fs
$remote_fs
+# Required-Stop:
$remote_fs
# Should-Start: $named
# Should-Stop:
# Default-Start: 2 3 4 5
# Should-Start: $named
# Should-Stop:
# Default-Start: 2 3 4 5
@@
-42,7
+42,7
@@
test -x $DAEMON || exit 0
. /lib/lsb/init-functions
# Default options, these can be overriden by the information
. /lib/lsb/init-functions
# Default options, these can be overriden by the information
-# at /etc/default/
$NAME
+# at /etc/default/
openvswitch-controller
DAEMON_OPTS="" # Additional options given to the server
DODTIME=10 # Time to wait for the server to die, in seconds
DAEMON_OPTS="" # Additional options given to the server
DODTIME=10 # Time to wait for the server to die, in seconds
@@
-175,10
+175,10
@@
force_stop() {
if running ; then
kill -15 $pid
# Is it really dead?
if running ; then
kill -15 $pid
# Is it really dead?
- sleep "$D
IETIME"s
+ sleep "$D
ODTIME"
if running ; then
kill -9 $pid
if running ; then
kill -9 $pid
- sleep "$D
IETIME"s
+ sleep "$D
ODTIME"
if running ; then
echo "Cannot kill $NAME (pid=$pid)!"
exit 1
if running ; then
echo "Cannot kill $NAME (pid=$pid)!"
exit 1
@@
-237,7
+237,7
@@
case "$1" in
log_daemon_msg "Restarting $DESC" "$NAME"
stop_server
# Wait some sensible amount, some server need this
log_daemon_msg "Restarting $DESC" "$NAME"
stop_server
# Wait some sensible amount, some server need this
- [ -n "$D
IETIME" ] && sleep $DIE
TIME
+ [ -n "$D
ODTIME" ] && sleep $DOD
TIME
start_server
running
log_end_msg $?
start_server
running
log_end_msg $?
@@
-260,7
+260,7
@@
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
+ N=/etc/init.d/
openvswitch-controller
echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
exit 1
;;
echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
exit 1
;;