- formatting and cosmetics, unify actions order

Changed files:
    opensshd.init -> 1.43

diff --git a/opensshd.init b/opensshd.init
index 00e3ab227895502e2344e700f8628dd6d4bd8221..df9599d3be3303082909993258202775e816c65b 100644 (file)
--- a/opensshd.init
+++ b/opensshd.init
@@ -8,14 +8,14 @@
 #              Ssh can be used for remote login, remote file copying, TCP port \
 #              forwarding etc. Ssh offers strong encryption and authentication.
 
-SSHD_OOM_ADJUST=-1000
-
 # Source function library
 . /etc/rc.d/init.d/functions
 
 # Get network config
 . /etc/sysconfig/network
 
+SSHD_OOM_ADJUST=-1000
+
 # Get service config
 [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
 
@@ -73,7 +73,6 @@ start() {
        fi
 
        ssh_gen_keys
-
        checkconfig
 
        if [ ! -s /etc/ssh/ssh_host_key ]; then
@@ -97,16 +96,30 @@ start() {
 }
 
 stop() {
-       if [ -f /var/lock/subsys/sshd ]; then
-               msg_stopping "OpenSSH"
-               # we use start-stop-daemon to stop sshd, as it is unacceptable for such
-               # critical service as sshd to kill it by procname, but unfortunately
-               # rc-scripts does not provide way to kill *only* by pidfile
-               start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid && ok || fail
-               rm -f /var/lock/subsys/sshd >/dev/null 2>&1
-       else
+       if [ ! -f /var/lock/subsys/sshd ]; then
                msg_not_running "OpenSSH"
+               return
        fi
+
+       msg_stopping "OpenSSH"
+       # we use start-stop-daemon to stop sshd, as it is unacceptable for such
+       # critical service as sshd to kill it by procname, but unfortunately
+       # rc-scripts does not provide way to kill *only* by pidfile
+       start-stop-daemon --stop --quiet --pidfile /var/run/sshd.pid && ok || fail
+       rm -f /var/lock/subsys/sshd >/dev/null 2>&1
+}
+
+reload() {
+       if [ ! -f /var/lock/subsys/sshd ]; then
+               msg_not_running "OpenSSH"
+               RETVAL=7
+               return
+       fi
+
+       checkconfig
+       msg_reloading "OpenSSH"
+       killproc sshd -HUP
+       RETVAL=$?
 }
 
 upstart_controlled --except init configtest
@@ -125,9 +138,11 @@ case "$1" in
        stop
        start
        ;;
-  status)
-       status sshd
-       exit $?
+  reload|force-reload)
+       reload
+       ;;
+  configtest)
+       checkconfig
        ;;
   init)
        nls "Now the SSH host key will be generated. Please note, that if you"
@@ -135,22 +150,12 @@ case "$1" in
        nls "reboot."
        ssh_gen_keys
        ;;
-  configtest)
-       checkconfig
-       ;;
-  reload|force-reload)
-       if [ -f /var/lock/subsys/sshd ]; then
-               checkconfig
-               msg_reloading "OpenSSH"
-               killproc sshd -HUP
-               RETVAL=$?
-       else
-               msg_not_running "OpenSSH"
-               exit 7
-       fi
+  status)
+       status sshd
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|init|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|configtest|init|status}"
        exit 3
 esac