diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-09-23 13:37:58 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-09-23 18:21:31 -0700 |
| commit | 9704460403a02554595b5a7ed17914a0b0357cac (patch) | |
| tree | a993bc7e10441e06cdc8e455a58bea788f5e1aa9 /debian/openvswitch-controller.init | |
| parent | 69c675a07271d6b4b9bfd9ed49ac354f7af24613 (diff) | |
| download | openvswitch-9704460403a02554595b5a7ed17914a0b0357cac.tar.gz | |
debian: Use DODTIME instead of DIETIME in init scripts
Brad pointed out that openvswitch-ipsec init script defined the variable
DIETIME but attempted to use it as DODTIME. This commit uses DODTIME,
since it's the name used by the openvswitch-switch init script. The
openvswitch-controller init script had the same issue.
As suggested by Ben, the "s" suffixes are removed from sleep commands,
since they are a GNU extension.
Reported-by: Brad Hall <brad@nicira.com>
Diffstat (limited to 'debian/openvswitch-controller.init')
| -rwxr-xr-x | debian/openvswitch-controller.init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init index d489869ed..4781f83f2 100755 --- a/debian/openvswitch-controller.init +++ b/debian/openvswitch-controller.init @@ -175,10 +175,10 @@ force_stop() { if running ; then kill -15 $pid # Is it really dead? - sleep "$DIETIME"s + sleep "$DODTIME" if running ; then kill -9 $pid - sleep "$DIETIME"s + sleep "$DODTIME" 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 - [ -n "$DIETIME" ] && sleep $DIETIME + [ -n "$DODTIME" ] && sleep $DODTIME start_server running log_end_msg $? |