Merge branch 'master' into f17

This commit is contained in:
Simone Caronni 2012-06-19 11:59:01 +02:00
commit c25b964193
3 changed files with 3 additions and 9 deletions

View File

@ -70,8 +70,6 @@ case "$1" in
stop stop
start start
;; ;;
reload)
;;
condrestart|try-restart) condrestart|try-restart)
if [ -f /var/lock/subsys/$prog ]; then if [ -f /var/lock/subsys/$prog ]; then
stop stop
@ -79,7 +77,7 @@ case "$1" in
fi fi
;; ;;
*) *)
echo "Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}" echo "Usage: $prog {start|stop|status|restart|force-reload|condrestart|try-restart}"
[ "$1" = "usage" ] && exit 0 [ "$1" = "usage" ] && exit 0
exit 2 exit 2
;; ;;

View File

@ -70,8 +70,6 @@ case "$1" in
stop stop
start start
;; ;;
reload)
;;
condrestart|try-restart) condrestart|try-restart)
if [ -f /var/lock/subsys/$prog ]; then if [ -f /var/lock/subsys/$prog ]; then
stop stop
@ -79,7 +77,7 @@ case "$1" in
fi fi
;; ;;
*) *)
echo "Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}" echo "Usage: $prog {start|stop|status|restart|force-reload|condrestart|try-restart}"
[ "$1" = "usage" ] && exit 0 [ "$1" = "usage" ] && exit 0
exit 2 exit 2
;; ;;

View File

@ -69,8 +69,6 @@ case "$1" in
stop stop
start start
;; ;;
reload)
;;
condrestart|try-restart) condrestart|try-restart)
if [ -f /var/lock/subsys/$prog ]; then if [ -f /var/lock/subsys/$prog ]; then
stop stop
@ -78,7 +76,7 @@ case "$1" in
fi fi
;; ;;
*) *)
echo "Usage: $prog {start|stop|restart|condrestart|try-restart|reload|force-reload|status|usage}" echo "Usage: $prog {start|stop|status|restart|force-reload|condrestart|try-restart}"
[ "$1" = "usage" ] && exit 0 [ "$1" = "usage" ] && exit 0
exit 2 exit 2
;; ;;