- unify names

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

diff --git a/dhcp6c.init b/dhcp6c.init
index 0d024c5d1ae017fa64115b13ee8c379e9f473512..5610df128178be5bfc0c028ca32b700e9da66a5a 100644 (file)
--- a/dhcp6c.init
+++ b/dhcp6c.init
@@ -10,6 +10,7 @@
 # processname: dhcp6c
 # config: /etc/dhcp6c.conf
 # config: /etc/sysconfig/dhcp6c
+
 # Source function library
 . /etc/rc.d/init.d/functions
 
@@ -22,7 +23,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down DHCP6C
+               msg_network_down "DHCPv6 client daemon"
                exit 1
        fi
 else
@@ -32,22 +33,22 @@ fi
 start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/dhcp6c ]; then
-               msg_starting "DHCP6C"
+               msg_starting "DHCPv6 client daemon"
                daemon dhcp6c $DHCP6CIF
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcp6c
        else
-               msg_already_running DHCP6C
+               msg_already_running "DHCPv6 client daemon"
        fi
 }
 
 stop() {
        if [ -f /var/lock/subsys/dhcp6c ]; then
-               msg_stopping "DHCP6C Server"
+               msg_stopping "DHCPv6 client daemon"
                killproc dhcp6c
                rm -f /var/run/dhcp6c.pid /var/lock/subsys/dhcp6c >/dev/null 2>&1
        else
-               msg_not_running DHCP6C
+               msg_not_running "DHCPv6 client daemon"
        fi
 }
 

diff --git a/dhcp6s.init b/dhcp6s.init
index 49017dc14bd4c2518f26b7c240f08caf16d4844b..8ccea44c1b9ac9e7da75ade89bb68ba7722a5e2a 100644 (file)
--- a/dhcp6s.init
+++ b/dhcp6s.init
@@ -11,6 +11,7 @@
 # config: /etc/dhcp6s.conf
 # config: /etc/server6_addr.conf
 # config: /etc/sysconfig/dhcp6s
+
 # Source function library
 . /etc/rc.d/init.d/functions
 
@@ -23,7 +24,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down DHCP6S
+               msg_network_down "DHCPv6 server daemon"
                exit 1
        fi
 else
@@ -33,22 +34,22 @@ fi
 start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/dhcp6s ]; then
-               msg_starting "DHCP6S"
+               msg_starting "DHCPv6 server daemon"
                daemon dhcp6s $DHCP6SIF
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dhcp6s
        else
-               msg_already_running DHCP6S
+               msg_already_running "DHCPv6 server daemon"
        fi
 }
 
 stop() {
        if [ -f /var/lock/subsys/dhcp6s ]; then
-               msg_stopping "DHCP6S Server"
+               msg_stopping "DHCPv6 server daemon"
                killproc dhcp6s
                rm -f /var/run/dhcp6s.pid /var/lock/subsys/dhcp6s >/dev/null 2>&1
        else
-               msg_not_running DHCP6S
+               msg_not_running "DHCPv6 server daemon"
        fi
 }