rev 17202 - trunk/packages/kdebase-workspace/debian

[Fathi Boudra]

Author: fabo
Date: 2010-02-28 11:16:39 +0000 (Sun, 28 Feb 2010)
New Revision: 17202

Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
Use lsb output functions in kdm init script.


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-02-28 11:15:31 UTC (rev 17201)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-02-28 11:16:39 UTC (rev 17202)
@@ -88,6 +88,10 @@
     - Finnish (Esko Arajärvi).  Closes: #533561
     - Polish (Marcin Owsiany).  Closes: #571311
 
+  [ Fathi Boudra ]
+  * Use lsb output functions in kdm init script.
+    Thanks to Petter Reinholdtsen. (Closes: #567802).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2010 01:19:19 +0200
 
 kdebase-workspace (4:4.3.4-5) unstable; urgency=high

Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2010-02-28 11:15:31 UTC (rev 17201)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2010-02-28 11:16:39 UTC (rev 17202)
@@ -119,11 +119,14 @@
     if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      echo "Not starting K Display Manager (kdm); it is not the default display manager."
+      log_action_msg "Not starting K Display Manager (kdm); it is not the default display manager."
     else
-      echo -n "Starting K Display Manager: kdm"
-      start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running"
-      echo "."
+      log_daemon_msg "Starting K Display Manager" "kdm"
+      if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG ; then
+        log_end_msg 0
+      else
+        log_action_end_msg 1 "already running"
+      fi
     fi
   ;;
 
@@ -138,11 +141,11 @@
   ;;
 
   reload)
-    echo -n "Reloading K Display Manager configuration..."
+    log_action_begin_msg "Reloading K Display Manager configuration..."
     if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      echo "done."
+      log_action_end_msg 0
     else
-      echo "kdm not running."
+      log_action_end_msg 1 "kdm not running"
     fi
   ;;
 
@@ -151,9 +154,9 @@
   ;;
 
   stop)
-    echo -n "Stopping K Display Manager: kdm"
+    log_action_begin_msg "Stopping K Display Manager: kdm"
     if [ ! -f $PIDFILE ]; then
-      echo " not running ($PIDFILE not found)."
+      log_action_end_msg 0 " not running ($PIDFILE not found)"
       exit 0
     else
       DAEMONPID=$(cat $PIDFILE | tr -d '[:blank:]')
@@ -163,7 +166,7 @@
           # give kdm's signal handler a second to catch its breath
           sleep 1
         else
-          echo -n " not running"
+          log_action_cont_msg " not running"
         fi
       fi
       while [ $KILLCOUNT -le 5 ]; do
@@ -176,12 +179,12 @@
         KILLCOUNT=$(( $KILLCOUNT + 1 ))
       done
       if stillrunning; then
-        echo -n " not responding to TERM signal (pid $DAEMONPID)"
+        log_action_cont_msg " not responding to TERM signal (pid $DAEMONPID)"
       else
         rm -f $UPGRADEFILE
       fi
     fi
-    echo "."
+    log_action_end_msg 0
   ;;
   status)
     status_of_proc -p "$PIDFILE" "$DAEMON" kdm && exit 0 || exit $?