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

[Fathi Boudra]

Author: fabo
Date: 2010-02-28 12:36:19 +0000 (Sun, 28 Feb 2010)
New Revision: 17205

Modified:
   trunk/packages/kdebase-workspace/debian/kdm.init
Log:
function name consistency.


Modified: trunk/packages/kdebase-workspace/debian/kdm.init
===================================================================
--- trunk/packages/kdebase-workspace/debian/kdm.init	2010-02-28 12:34:43 UTC (rev 17204)
+++ trunk/packages/kdebase-workspace/debian/kdm.init	2010-02-28 12:36:19 UTC (rev 17205)
@@ -106,7 +106,7 @@
   SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
 fi
 
-stillrunning () {
+still_running () {
   if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
     true
   else
@@ -136,7 +136,7 @@
   restart)
     /etc/init.d/kdm stop
     if [ -f $PIDFILE ]; then
-      if stillrunning; then
+      if still_running; then
         exit 1
       fi
     fi
@@ -173,7 +173,7 @@
         fi
       fi
       while [ $KILLCOUNT -le 5 ]; do
-        if stillrunning; then
+        if still_running; then
           kill $DAEMONPID
         else
           break
@@ -181,7 +181,7 @@
         sleep 1
         KILLCOUNT=$(( $KILLCOUNT + 1 ))
       done
-      if stillrunning; then
+      if still_running; then
         log_action_cont_msg " not responding to TERM signal (pid $DAEMONPID)"
       else
         rm -f $UPGRADEFILE