- msg_Usage_noreload() and msg_Usage_reload() replace by msg_Usage().

svn-id: @673

diff --git a/rc.d/init.d/<template>.init b/rc.d/init.d/<template>.init
index a987cc605702ce449ba4f0b8ee8d4a9cfd564f4f..a199bd6c495e42d6576513fd2037378d551ccc85 100644 (file)
--- a/rc.d/init.d/<template>.init
+++ b/rc.d/init.d/<template>.init
@@ -92,12 +92,8 @@ case "$1" in
        exit $?
         ;;
   *)
-       # for programs that support reloading
         # show "Usage: %s {start|stop|status|restart|reload|force-reload}" $0
-       msg_Usage_reload $0
-       # for these that do not
-       # show "Usage: %s {start|stop|status|restart|force-reload}" $0
-       msg_Usage_noreload $0
+       msg_Usage "$0 {start|stop|status|restart|reload|force-reload}"
         exit 1
 esac
 

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index ef22f57e198e2bca62a83f1d1931370d1e2a95fd..10294c652f7277340113a9008f908dd909166221 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -1,7 +1,7 @@
 # functions    This file contains functions to be used by most or all
 #              shell scripts in the /etc/init.d directory.
 #
-# $Id: functions,v 1.43 2000/03/09 11:50:24 zagrodzki Exp $
+# $Id: functions,v 1.44 2000/03/10 01:31:25 kloczek Exp $
 #
 # Author:      Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:    Greg Galloway and Marc Ewing
@@ -425,12 +425,7 @@ msg_reloading()
        show "Reloading %s service" "$1"
 }
 
-msg_Usage_reload()
+msg_Usage()
 {
-       nls "Usage: %s {start|stop|status|restart|reload|force-reload}\n" "$1"
-}
-
-msg_Usage_noreload()
-{
-       nls "Usage: %s {start|stop|status|restart|force-reload}\n" "$1"
+       nls "Usage:" "$1\n"
 }