- fixed force-reload, added try-restart action

Changed files:
    dhcp6c.init -> 1.6
    dhcp6s.init -> 1.7

diff --git a/dhcp6c.init b/dhcp6c.init
index 5610df128178be5bfc0c028ca32b700e9da66a5a..a90d641855a3fe88c7088d1e777733d8b17d6aad 100644 (file)
--- a/dhcp6c.init
+++ b/dhcp6c.init
@@ -52,6 +52,16 @@ stop() {
        fi
 }
 
+condrestart() {
+       if [ -f /var/lock/subsys/dhcp6c ]; then
+               stop
+               start
+       else
+               msg_not_running "DHCPv6 client daemon"
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 case "$1" in
   start)
@@ -60,16 +70,22 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|reload)
+  restart)
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status dhcp6c
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac
 

diff --git a/dhcp6s.init b/dhcp6s.init
index 8ccea44c1b9ac9e7da75ade89bb68ba7722a5e2a..9adb5d1569533033ca26bde1578a5f61fc1fafd3 100644 (file)
--- a/dhcp6s.init
+++ b/dhcp6s.init
@@ -53,6 +53,16 @@ stop() {
        fi
 }
 
+condrestart() {
+       if [ -f /var/lock/subsys/dhcp6s ]; then
+               stop
+               start
+       else
+               msg_not_running "DHCPv6 server daemon"
+               RETVAL=$1
+       fi
+}
+
 RETVAL=0
 case "$1" in
   start)
@@ -61,16 +71,22 @@ case "$1" in
   stop)
        stop
        ;;
-  restart|reload)
+  restart)
        stop
        start
        ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
   status)
        status dhcp6s
        exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"
        exit 3
 esac