- add try-restart, cosmetics

Changed files:
    xrdp.init -> 1.2

diff --git a/xrdp.init b/xrdp.init
index 4e20011f985e1ddbfb839884f3b84738b35e6a78..5994fadbb6b3071b0e060f8e8c1ebe9b3762ffe1 100644 (file)
--- a/xrdp.init
+++ b/xrdp.init
@@ -52,6 +52,28 @@ stop() {
        fi
 }
 
+reload() {
+       if [ -f /var/lock/subsys/xrdp ]; then
+               msg_reloading "xrdp"
+               killproc xrdp -HUP
+               killproc sesman -HUP
+               RETVAL=$?
+       else
+               msg_not_running "xrdp"
+               exit 7
+       fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/xrdp ]; then
+               stop
+               start
+       else
+               msg_not_running "xrdp"
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -61,27 +83,22 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status xrdp
-       exit $?
-       ;;
   restart)
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
   reload|force-reload)
-       if [ -f /var/lock/subsys/xrdp ]; then
-               msg_reloading "xrdp"
-               killproc xrdp -HUP
-               killproc sesman -HUP
-               RETVAL=$?
-       else
-               msg_not_running "xrdp"
-               exit 7
-       fi
+       reload
+       ;;
+  status)
+       status xrdp
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}"
        exit 3
 esac