- updated to latest rc-scripts

Changed files:
    xdm.init -> 1.4
    xfs.init -> 1.4

diff --git a/xdm.init b/xdm.init
index 2325169dc789c5dfb0c5b8b0ced5d2ed775ef14b..a9d850ae117eab936a342df31e106edc4ea23a2d 100644 (file)
--- a/xdm.init
+++ b/xdm.init
@@ -25,15 +25,15 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ -f /var/lock/subsys/xdm ]; then
-               echo "Starting X Display Manager already is running"
+               msg_Already_Running "X Display Manager"
        else
-               show Starting X Display Manager daemon
+               msg_starting "X Display Manager"
                daemon /usr/X11R6/bin/xdm
                touch /var/lock/subsys/xdm
        fi
        ;;
   stop)
-       show Stopping X Display Manager daemon
+       msg_stopping "X Display Manager"
        killproc xdm
        rm -f /var/lock/subsys/xdm
        ;;
@@ -45,7 +45,7 @@ case "$1" in
        $0 start
        ;;
   *)
-       echo "Usage: $0 {start|stop|status|restart|reload}"
+       msg_Usage "$0 {start|stop|status|restart|reload}"
        exit 1
 esac
 

diff --git a/xfs.init b/xfs.init
index b40c8b5a70ee43b8e75af80592bd2ba9356ea852..3432c559b09c6e009554bbeecd0f810a73ff2b9c 100644 (file)
--- a/xfs.init
+++ b/xfs.init
@@ -24,18 +24,18 @@ case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/xfs ]; then
-               show Starting X Font Server
+               msg_starting "X Font Server"
                rm -fr /tmp/.font-unix
                daemon xfs \
                        $([ -n "$XFS_PORT" ] && echo "-port $XFS_PORT") \
-                       $([ -n "$XFS_OPTIONS" ] && echo "-port $XFS_PORT")
+                       $([ -n "$XFS_OPTIONS" ] && echo "$XFS_OPTIONS")
        else
-               echo "X Font Server already is running"
+               mag_Already_Running "X Font Server"
        fi
        touch /var/lock/subsys/xfs
        ;;
   stop)
-       show Shutting down X Font Server
+       msg_stopping "X Font Server"
        killproc xfs
        rm -f /var/lock/subsys/xfs
        ;;
@@ -48,16 +48,16 @@ case "$1" in
        ;;
   reload)
        if [ -f /var/lock/subsys/xfs ]; then
-               show "Reload X Font Server configuration"
+               msg_Reloading "X Font Server"
                killproc xfs -USR1
                deltext;
                ok;
        else
-               echo "Reload X Font Server not runed"
+               msg_Not_Running "X Font Server"
        fi
        ;;
   *)
-       echo "*** Usage: xfs {start|stop|status|restart|reload}"
+       msg_Usage "$0 {start|stop|status|restart|reload}"
        exit 1
 esac