diff -ur lcgdm-1.8.1.2.orig/rfio/rfiod.scripts lcgdm-1.8.1.2/rfio/rfiod.scripts
--- lcgdm-1.8.1.2.orig/rfio/rfiod.scripts	2011-05-31 12:22:46.000000000 +0200
+++ lcgdm-1.8.1.2/rfio/rfiod.scripts	2011-09-03 10:10:32.937315657 +0200
@@ -40,7 +40,7 @@
     . /etc/rc.d/init.d/functions
     DAEMON=daemon
     FAILURE=failure
-    ECHO_FAILURE=failure
+    ECHO_FAILURE=echo_failure
     SUCCESS=success
     ECHO_SUCCESS=echo_success
     ECHO_END=echo
@@ -94,18 +94,12 @@
 
 case "$1" in
   start)
-    echo $ECHOOPT "Starting $prog: "
     if [ -f ${NOMORERFIO} ]; then
         echo $ECHOOPT "${NOMORERFIO} exists: "
         [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "${NOMORERFIO} exists: "
         RETVAL=0
     else
-        if [ $sysname = "Linux" -a `whoami` = "root" ]; then
-            netstat -ap | egrep '\*:5001|\*:rfio' | grep LISTEN | grep rfiod > /dev/null
-        else
-            netstat -a  | egrep '\*[:.]5001|\*[:.]rfio' | egrep 'LISTEN *$' > /dev/null
-        fi
-        # ps -eo ppid,$format4comm | egrep '^[ \t]+1 rfiod' > /dev/null
+        netstat -an | egrep '[:.]5001' | egrep 'LISTEN *$' > /dev/null
         if [ $? -eq 0 ]; then
             echo $ECHOOPT "rfiod already started: "
             [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already started: "
@@ -129,6 +123,7 @@
                 fi
             fi
             if [ $RETVAL -eq 0 ]; then
+                echo $ECHOOPT "Starting $prog: "
                 cd /
                 mkdir -p `dirname $RFIOLOGFILE`
                 touch $RFIOLOGFILE
@@ -142,10 +137,10 @@
                         rm -f $PIDFILE
                         echo $pid > $PIDFILE
                     fi
+                    [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
                     RETVAL=0
                 else
-                    echo $ECHOOPT "rfiod not started: "
-                    [ -n "$FAILURE" ] && $FAILURE "rfiod not started: "
+                    [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
                     RETVAL=1
                 fi
             fi
@@ -155,63 +150,46 @@
     ;;
   stop)
     if [ -f $PIDFILE ]; then
-        [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
+        echo $ECHOOPT "Stopping $prog: "
         #
         ## We just attempt to kill the main daemon
         ## Remaining child are allowed to continue transfer up to
         ## the end
         #
-        if [ $SILENTSTOP -eq 0 ]; then
-            kill -9 `cat $PIDFILE`
-        else
-            kill -9 `cat $PIDFILE` > /dev/null 2>&1
-        fi
+        kill -9 `cat $PIDFILE` > /dev/null 2>&1
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
             rm -f $PIDFILE
+            [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
+        else
+            [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
         fi
     else
         # rfio might have been started by hand
         pid=`ps -eo pid,ppid,$format4comm | grep " 1 rfiod$" | awk '{print $1}'`
         if [ -n "$pid" ]; then
-            [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
+            echo $ECHOOPT "Stopping $prog: "
             #
             ## We just attempt to kill the main daemon
             ## Remaining child are allowed to continue transfer up to
             ## the end
             #
-            if [ $SILENTSTOP -eq 0 ]; then
-                kill -9 $pid
+            kill -9 $pid > /dev/null 2>&1
+            RETVAL=$?
+            if [ $RETVAL -eq 0 ]; then
+                [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
             else
-                kill -9 $pid > /dev/null 2>&1
+                [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
             fi
-            RETVAL=$?
-        else
-            [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "rfiod already stopped: "
-            [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already stopped: "
-            RETVAL=0
-        fi
-    fi
-    if [ $SILENTSTOP -eq 0 -a $sysname = "Linux" ]; then
-        if [ $RETVAL -eq 0 ]; then
-            $ECHO_SUCCESS
         else
-            $ECHO_FAILURE
+            echo $ECHOOPT "rfiod already stopped: "
+            [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already stopped: "
+            [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
         fi
     fi
 
     [ -d $SUBSYSDIR ] && rm -f $SUBSYS
-    [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
-    #
-    ## Basically: if SILENTSTOP is not 0 when we never print something
-    ## But if the stop is successful... One might want to see stop: OK
-    ## anyway ?
-    #
-    if [ $SILENTSTOP -ne 0 -a $RETVAL -eq 0 ]; then
-        echo $ECHOOPT "Stopping $prog: "
-        [ $sysname = "Linux" ] && $ECHO_SUCCESS
-        [ -n "$ECHO_END" ] && $ECHO_END
-    fi
+    $ECHO_END
     ;;
   restart | force-reload)
     $0 stop
@@ -219,15 +197,7 @@
         $0 start
         RETVAL=$?
     else
-        #
-        ## It is legal to return zero it if was
-        ## a conditional restart
-        #
-        if [ $SILENTSTOP -eq 0 ]; then
-            RETVAL=1
-        else
-            RETVAL=0
-        fi
+        RETVAL=0
     fi
     ;;
   condrestart | try-restart)