[lcgdm] - Add database schema migration to scriptlets - Fix broken condrestart action in start-up scripts
Mattias Ellert
ellert at fedoraproject.org
Wed Dec 29 14:01:05 UTC 2010
commit e8c5efbcb01266ef8662489fed2e837b294bc602
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Wed Dec 29 14:57:34 2010 +0100
- Add database schema migration to scriptlets
- Fix broken condrestart action in start-up scripts
lcgdm-condrestart.patch | 4655 +++++++++++++++++++++++++++++++++++++++++++++++
lcgdm.spec | 295 +++-
2 files changed, 4934 insertions(+), 16 deletions(-)
---
diff --git a/lcgdm-condrestart.patch b/lcgdm-condrestart.patch
new file mode 100644
index 0000000..783310d
--- /dev/null
+++ b/lcgdm-condrestart.patch
@@ -0,0 +1,4655 @@
+diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.mysql lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.mysql
+--- lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.mysql 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.mysql 2010-12-29 13:03:04.995912975 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5016|\*:dicomcopyd' | grep LISTEN | grep dicomcopyd > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5016|\*[:.]dicomcopyd' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dicomcopyd' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dicomcopyd already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DICOMCOPYDLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dicomcopyd not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dicomcopyd not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DICOMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DICOMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dicomcopyd might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DICOMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DICOMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd 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 "dicomcopyd already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.oracle lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.oracle
+--- lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.oracle 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.oracle 2010-12-29 13:02:47.638152322 +0100
+@@ -43,7 +43,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
+@@ -104,14 +104,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5016|\*:dicomcopyd' | grep LISTEN | grep dicomcopyd > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5016|\*[:.]dicomcopyd' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dicomcopyd' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dicomcopyd already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already started: "
+ RETVAL=0
+@@ -135,13 +129,13 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -159,10 +153,11 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DICOMCOPYDLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE`
+@@ -180,10 +175,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dicomcopyd not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dicomcopyd not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -192,72 +187,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DICOMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DICOMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dicomcopyd might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DICOMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DICOMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd 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 "dicomcopyd already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -269,7 +241,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -278,15 +250,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)
+diff -ur lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.postgresql lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/dicomcopy/dicomcopyd.scripts.postgresql 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/dicomcopy/dicomcopyd.scripts.postgresql 2010-12-29 13:02:28.751412751 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5016|\*:dicomcopyd' | grep LISTEN | grep dicomcopyd > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5016|\*[:.]dicomcopyd' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dicomcopyd' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dicomcopyd already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DICOMCOPYDLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DICOMCOPYDLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dicomcopyd not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dicomcopyd not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DICOMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DICOMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dicomcopyd might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dicomcopyd$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DICOMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DICOMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DICOMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dicomcopyd already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd 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 "dicomcopyd already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dicomcopyd already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/dli/lfc-dli.scripts lcgdm-1.8.0.1/dli/lfc-dli.scripts
+--- lcgdm-1.8.0.1.orig/dli/lfc-dli.scripts 2010-12-20 11:40:00.000000000 +0100
++++ lcgdm-1.8.0.1/dli/lfc-dli.scripts 2010-12-29 13:02:15.189599754 +0100
+@@ -42,7 +42,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
+@@ -100,14 +100,8 @@
+ X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8085|\*:lfc-dli' | grep LISTEN | grep lfc-dli > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8085|\*[:.]lfc-dli' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfc-dli' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "lfc-dli already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfc-dli already started: "
+ RETVAL=0
+@@ -130,6 +124,7 @@
+ fi
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DLIDAEMONLOGFILE`
+ chown $LFCUSER:$LFCGROUP `dirname $DLIDAEMONLOGFILE`
+@@ -143,10 +138,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "lfc-dli not started: "
+- [ -n "$FAILURE" ] && $FAILURE "lfc-dli not started: "
+++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -155,84 +150,61 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DLISHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DLISHUTDOWN -f -h `hostname`
+- else
+- $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # lfc-dli might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DLISHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DLISHUTDOWN -f -h `hostname`
+- else
+- $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DLISHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfc-dli already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfc-dli 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 "lfc-dli already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfc-dli already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+- lpid="X"
+- while [ "x$lpid" != "x" ]; do
+- sleep 1
+- #Does not seem to work on SunOS ;-)
+- lpid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
+- done
++ lpid="X"
++ while [ "x$lpid" != "x" ]; do
++ sleep 1
++ #Does not seem to work on SunOS ;-)
++ lpid=`ps -eo pid,ppid,$format4comm | grep " 1 lfc-dli$" | awk '{print $1}'`
++ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -241,15 +213,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)
+diff -ur lcgdm-1.8.0.1.orig/dpm/dpm.scripts.mysql lcgdm-1.8.0.1/dpm/dpm.scripts.mysql
+--- lcgdm-1.8.0.1.orig/dpm/dpm.scripts.mysql 2010-12-20 11:39:52.000000000 +0100
++++ lcgdm-1.8.0.1/dpm/dpm.scripts.mysql 2010-12-29 13:01:03.351590305 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5015|\*:dpm' | grep LISTEN | grep dpm > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5015|\*[:.]dpm' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpm' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpm already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already started: "
+ RETVAL=0
+@@ -132,11 +126,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPMDAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE`
+@@ -156,10 +151,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpm not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpm not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -168,72 +163,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMSHUTDOWN -f -h `hostname`
+- else
+- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpm might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMSHUTDOWN -f -h `hostname`
+- else
+- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm 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 "dpm already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -245,7 +217,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -254,15 +226,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)
+diff -ur lcgdm-1.8.0.1.orig/dpm/dpm.scripts.oracle lcgdm-1.8.0.1/dpm/dpm.scripts.oracle
+--- lcgdm-1.8.0.1.orig/dpm/dpm.scripts.oracle 2010-12-20 11:39:52.000000000 +0100
++++ lcgdm-1.8.0.1/dpm/dpm.scripts.oracle 2010-12-29 13:00:50.246770998 +0100
+@@ -43,7 +43,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
+@@ -104,14 +104,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5015|\*:dpm' | grep LISTEN | grep dpm > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5015|\*[:.]dpm' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpm' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpm already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already started: "
+ RETVAL=0
+@@ -134,13 +128,13 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -158,10 +152,11 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPMDAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE`
+@@ -181,10 +176,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpm not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpm not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -193,72 +188,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMSHUTDOWN -f -h `hostname`
+- else
+- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpm might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMSHUTDOWN -f -h `hostname`
+- else
+- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm 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 "dpm already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -270,7 +242,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -279,15 +251,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)
+diff -ur lcgdm-1.8.0.1.orig/dpm/dpm.scripts.postgresql lcgdm-1.8.0.1/dpm/dpm.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/dpm/dpm.scripts.postgresql 2010-12-20 11:39:52.000000000 +0100
++++ lcgdm-1.8.0.1/dpm/dpm.scripts.postgresql 2010-12-29 13:00:35.979967717 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5015|\*:dpm' | grep LISTEN | grep dpm > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5015|\*[:.]dpm' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpm' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpm already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already started: "
+ RETVAL=0
+@@ -132,11 +126,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPMDAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPMDAEMONLOGFILE`
+@@ -156,10 +151,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpm not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpm not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -168,72 +163,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMSHUTDOWN -f -h `hostname`
+- else
+- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpm might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpm$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMSHUTDOWN -f -h `hostname`
+- else
+- $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpm already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm 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 "dpm already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpm already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -245,7 +217,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -254,15 +226,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)
+diff -ur lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.mysql lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.mysql
+--- lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.mysql 2010-12-20 11:39:55.000000000 +0100
++++ lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.mysql 2010-12-29 13:01:59.767812401 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5017|\*:dpmcopyd' | grep LISTEN | grep dpmcopyd > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5017|\*[:.]dpmcopyd' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpmcopyd' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpmcopyd already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPMCOPYDLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpmcopyd not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpmcopyd not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpmcopyd might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd 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 "dpmcopyd already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.oracle lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.oracle
+--- lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.oracle 2010-12-20 11:39:55.000000000 +0100
++++ lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.oracle 2010-12-29 13:01:44.989016181 +0100
+@@ -43,7 +43,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
+@@ -104,14 +104,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5017|\*:dpmcopyd' | grep LISTEN | grep dpmcopyd > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5017|\*[:.]dpmcopyd' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpmcopyd' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpmcopyd already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already started: "
+ RETVAL=0
+@@ -135,13 +129,13 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -159,11 +153,12 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPMCOPYDLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE`
+@@ -181,10 +176,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpmcopyd not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpmcopyd not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -193,72 +188,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpmcopyd might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd 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 "dpmcopyd already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -270,7 +242,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -279,15 +251,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)
+diff -ur lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.postgresql lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/dpmcopy/dpmcopyd.scripts.postgresql 2010-12-20 11:39:55.000000000 +0100
++++ lcgdm-1.8.0.1/dpmcopy/dpmcopyd.scripts.postgresql 2010-12-29 13:01:20.062359887 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5017|\*:dpmcopyd' | grep LISTEN | grep dpmcopyd > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5017|\*[:.]dpmcopyd' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpmcopyd' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpmcopyd already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPMCOPYDLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPMCOPYDLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpmcopyd not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpmcopyd not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpmcopyd might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpmcopyd$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPMCOPYSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPMCOPYSHUTDOWN -f -h `hostname`
+- else
+- $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPMCOPYSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpmcopyd already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd 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 "dpmcopyd already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpmcopyd already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.mysql lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.mysql
+--- lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.mysql 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.mysql 2010-12-29 12:58:39.514573554 +0100
+@@ -38,7 +38,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
+@@ -97,14 +97,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5010|\*:dpns' | grep LISTEN | grep dpnsdaemon > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5010|\*[:.]dpns' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpnsdaemon' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpnsdaemon already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already started: "
+ RETVAL=0
+@@ -126,11 +120,12 @@
+ fi
+ fi
+ if [ ! -s "$NSCONFIGFILE" ]; then
+- echo "FAILED : config file $NSCONFIGFILE empty"
++ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPNSDAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE`
+@@ -148,10 +143,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpnsdaemon not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -160,72 +155,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPNSSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPNSSHUTDOWN -f -h `hostname`
+- else
+- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpnsdaemon might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPNSSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPNSSHUTDOWN -f -h `hostname`
+- else
+- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon 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 "dpnsdaemon already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -237,7 +209,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -246,15 +218,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)
+diff -ur lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.oracle lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.oracle
+--- lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.oracle 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.oracle 2010-12-29 12:58:22.389809665 +0100
+@@ -38,7 +38,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
+@@ -99,14 +99,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5010|\*:dpns' | grep LISTEN | grep dpnsdaemon > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5010|\*[:.]dpns' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpnsdaemon' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpnsdaemon already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already started: "
+ RETVAL=0
+@@ -128,13 +122,13 @@
+ fi
+ fi
+ if [ ! -s "$NSCONFIGFILE" ]; then
+- echo "FAILED : config file $NSCONFIGFILE empty"
++ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -152,11 +146,12 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPNSDAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE`
+@@ -174,10 +169,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpnsdaemon not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -186,72 +181,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPNSSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPNSSHUTDOWN -f -h `hostname`
+- else
+- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpnsdaemon might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPNSSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPNSSHUTDOWN -f -h `hostname`
+- else
+- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon 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 "dpnsdaemon already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -263,7 +235,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -272,15 +244,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)
+diff -ur lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.postgresql lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/ns/dpnsdaemon.scripts.postgresql 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/ns/dpnsdaemon.scripts.postgresql 2010-12-29 12:57:55.867175350 +0100
+@@ -38,7 +38,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
+@@ -97,14 +97,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5010|\*:dpns' | grep LISTEN | grep dpnsdaemon > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5010|\*[:.]dpns' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 dpnsdaemon' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "dpnsdaemon already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already started: "
+ RETVAL=0
+@@ -126,11 +120,12 @@
+ fi
+ fi
+ if [ ! -s "$NSCONFIGFILE" ]; then
+- echo "FAILED : config file $NSCONFIGFILE empty"
++ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $DPNSDAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $DPNSDAEMONLOGFILE`
+@@ -148,10 +143,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "dpnsdaemon not started: "
+- [ -n "$FAILURE" ] && $FAILURE "dpnsdaemon not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -160,72 +155,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPNSSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPNSSHUTDOWN -f -h `hostname`
+- else
+- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # dpnsdaemon might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 dpnsdaemon$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $DPNSSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $DPNSSHUTDOWN -f -h `hostname`
+- else
+- $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $DPNSSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "dpnsdaemon already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon 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 "dpnsdaemon already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "dpnsdaemon already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -237,7 +209,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -246,15 +218,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)
+diff -ur lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.mysql lcgdm-1.8.0.1/ns/lfcdaemon.scripts.mysql
+--- lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.mysql 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/ns/lfcdaemon.scripts.mysql 2010-12-29 12:57:38.233418478 +0100
+@@ -38,7 +38,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
+@@ -97,14 +97,8 @@
+ X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5010|\*:lfc' | grep LISTEN | grep lfcdaemon > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5010|\*[:.]lfc' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfcdaemon' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "lfcdaemon already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already started: "
+ RETVAL=0
+@@ -136,11 +130,12 @@
+ fi
+ fi
+ if [ ! -s "$NSCONFIGFILE" ]; then
+- echo "FAILED : config file $NSCONFIGFILE empty"
++ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $LFCDAEMONLOGFILE`
+ chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE`
+@@ -158,10 +153,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "lfcdaemon not started: "
+- [ -n "$FAILURE" ] && $FAILURE "lfcdaemon not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -170,72 +165,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $LFCSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $LFCSHUTDOWN -f -h `hostname`
+- else
+- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # lfcdaemon might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $LFCSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $LFCSHUTDOWN -f -h `hostname`
+- else
+- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon 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 "lfcdaemon already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -247,7 +219,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -256,15 +228,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)
+diff -ur lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.oracle lcgdm-1.8.0.1/ns/lfcdaemon.scripts.oracle
+--- lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.oracle 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/ns/lfcdaemon.scripts.oracle 2010-12-29 12:57:22.746632001 +0100
+@@ -38,7 +38,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
+@@ -99,14 +99,8 @@
+ X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5010|\*:lfc' | grep LISTEN | grep lfcdaemon > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5010|\*[:.]lfc' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfcdaemon' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "lfcdaemon already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already started: "
+ RETVAL=0
+@@ -138,13 +132,13 @@
+ fi
+ fi
+ if [ ! -s "$NSCONFIGFILE" ]; then
+- echo "FAILED : config file $NSCONFIGFILE empty"
++ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -162,11 +156,12 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $LFCDAEMONLOGFILE`
+ chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE`
+@@ -184,10 +179,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "lfcdaemon not started: "
+- [ -n "$FAILURE" ] && $FAILURE "lfcdaemon not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -196,72 +191,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $LFCSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $LFCSHUTDOWN -f -h `hostname`
+- else
+- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # lfcdaemon might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $LFCSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $LFCSHUTDOWN -f -h `hostname`
+- else
+- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon 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 "lfcdaemon already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -273,7 +245,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -282,15 +254,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)
+diff -ur lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.postgresql lcgdm-1.8.0.1/ns/lfcdaemon.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/ns/lfcdaemon.scripts.postgresql 2010-12-20 11:39:59.000000000 +0100
++++ lcgdm-1.8.0.1/ns/lfcdaemon.scripts.postgresql 2010-12-29 12:57:05.606868315 +0100
+@@ -38,7 +38,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
+@@ -97,14 +97,8 @@
+ X509_USER_KEY=/etc/grid-security/$LFCUSER/lfckey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:5010|\*:lfc' | grep LISTEN | grep lfcdaemon > /dev/null
+- else
+- netstat -a | egrep '\*[:.]5010|\*[:.]lfc' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 lfcdaemon' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "lfcdaemon already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already started: "
+ RETVAL=0
+@@ -136,11 +130,12 @@
+ fi
+ fi
+ if [ ! -s "$NSCONFIGFILE" ]; then
+- echo "FAILED : config file $NSCONFIGFILE empty"
++ echo $ECHOOPT "config file $NSCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $NSCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $LFCDAEMONLOGFILE`
+ chown $LFCUSER:$LFCGROUP `dirname $LFCDAEMONLOGFILE`
+@@ -158,10 +153,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "lfcdaemon not started: "
+- [ -n "$FAILURE" ] && $FAILURE "lfcdaemon not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -170,72 +165,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $LFCSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $LFCSHUTDOWN -f -h `hostname`
+- else
+- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # lfcdaemon might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 lfcdaemon$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $LFCSHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $LFCSHUTDOWN -f -h `hostname`
+- else
+- $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $LFCSHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "lfcdaemon already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon 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 "lfcdaemon already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "lfcdaemon already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -247,7 +219,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -256,15 +228,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)
+diff -ur lcgdm-1.8.0.1.orig/rfio/rfiod.scripts lcgdm-1.8.0.1/rfio/rfiod.scripts
+--- lcgdm-1.8.0.1.orig/rfio/rfiod.scripts 2010-12-20 11:39:54.000000000 +0100
++++ lcgdm-1.8.0.1/rfio/rfiod.scripts 2010-12-29 12:55:02.893560170 +0100
+@@ -39,7 +39,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
+@@ -93,19 +93,13 @@
+
+ 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
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 rfiod$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "rfiod already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "rfiod already started: "
+ RETVAL=0
+@@ -128,6 +122,7 @@
+ fi
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $RFIOLOGFILE`
+ touch $RFIOLOGFILE
+@@ -141,10 +136,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
+@@ -154,63 +149,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
+@@ -218,15 +196,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.mysql lcgdm-1.8.0.1/srmv1/srmv1.scripts.mysql
+--- lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.mysql 2010-12-20 11:40:00.000000000 +0100
++++ lcgdm-1.8.0.1/srmv1/srmv1.scripts.mysql 2010-12-29 12:54:42.311843924 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8443|\*:srmv1' | grep LISTEN | grep srmv1 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8443|\*[:.]srmv1' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv1' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv1 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV1DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv1 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv1 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV1SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV1SHUTDOWN -f -h `hostname`
+- else
+- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv1 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV1SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV1SHUTDOWN -f -h `hostname`
+- else
+- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 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 "srmv1 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.oracle lcgdm-1.8.0.1/srmv1/srmv1.scripts.oracle
+--- lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.oracle 2010-12-20 11:40:01.000000000 +0100
++++ lcgdm-1.8.0.1/srmv1/srmv1.scripts.oracle 2010-12-29 12:54:21.233134526 +0100
+@@ -43,7 +43,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
+@@ -104,14 +104,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8443|\*:srmv1' | grep LISTEN | grep srmv1 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8443|\*[:.]srmv1' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv1' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv1 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already started: "
+ RETVAL=0
+@@ -135,13 +129,13 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -159,11 +153,12 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV1DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE`
+@@ -181,10 +176,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv1 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv1 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -193,72 +188,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV1SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV1SHUTDOWN -f -h `hostname`
+- else
+- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv1 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV1SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV1SHUTDOWN -f -h `hostname`
+- else
+- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 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 "srmv1 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -270,7 +242,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -279,15 +251,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.postgresql lcgdm-1.8.0.1/srmv1/srmv1.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/srmv1/srmv1.scripts.postgresql 2010-12-20 11:40:00.000000000 +0100
++++ lcgdm-1.8.0.1/srmv1/srmv1.scripts.postgresql 2010-12-29 12:53:33.765788931 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8443|\*:srmv1' | grep LISTEN | grep srmv1 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8443|\*[:.]srmv1' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv1' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv1 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV1DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV1DAEMONLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv1 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv1 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV1SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV1SHUTDOWN -f -h `hostname`
+- else
+- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv1 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv1$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV1SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV1SHUTDOWN -f -h `hostname`
+- else
+- $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV1SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv1 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 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 "srmv1 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv1 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.mysql lcgdm-1.8.0.1/srmv2/srmv2.scripts.mysql
+--- lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.mysql 2010-12-20 11:40:01.000000000 +0100
++++ lcgdm-1.8.0.1/srmv2/srmv2.scripts.mysql 2010-12-29 13:10:10.640043339 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8444|\*:srmv2' | grep LISTEN | grep srmv2 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8444|\*[:.]srmv2' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv2 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV2DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv2 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv2 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv2 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 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 "srmv2 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.oracle lcgdm-1.8.0.1/srmv2/srmv2.scripts.oracle
+--- lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.oracle 2010-12-20 11:40:01.000000000 +0100
++++ lcgdm-1.8.0.1/srmv2/srmv2.scripts.oracle 2010-12-29 12:51:59.251091913 +0100
+@@ -43,7 +43,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
+@@ -104,14 +104,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8444|\*:srmv2' | grep LISTEN | grep srmv2 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8444|\*[:.]srmv2' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv2 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already started: "
+ RETVAL=0
+@@ -135,13 +129,13 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -159,11 +153,12 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV2DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
+@@ -181,10 +176,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv2 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv2 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -193,72 +188,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv2 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 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 "srmv2 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -270,7 +242,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -279,15 +251,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.postgresql lcgdm-1.8.0.1/srmv2/srmv2.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/srmv2/srmv2.scripts.postgresql 2010-12-20 11:40:01.000000000 +0100
++++ lcgdm-1.8.0.1/srmv2/srmv2.scripts.postgresql 2010-12-29 12:51:31.100479991 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8444|\*:srmv2' | grep LISTEN | grep srmv2 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8444|\*[:.]srmv2' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv2 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV2DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv2 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv2 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv2 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 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 "srmv2 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.mysql lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.mysql
+--- lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.mysql 2010-12-20 11:39:55.000000000 +0100
++++ lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.mysql 2010-12-29 12:53:17.269016360 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8446|\*:srmv2.2' | grep LISTEN | grep srmv2.2 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8446|\*[:.]srmv2.2' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2.2' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv2.2 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV2DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv2.2 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv2.2 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv2.2 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 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 "srmv2.2 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.oracle lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.oracle
+--- lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.oracle 2010-12-20 11:39:55.000000000 +0100
++++ lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.oracle 2010-12-29 12:53:00.877242340 +0100
+@@ -43,7 +43,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
+@@ -104,14 +104,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8446|\*:srmv2.2' | grep LISTEN | grep srmv2.2 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8446|\*[:.]srmv2.2' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2.2' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv2.2 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already started: "
+ RETVAL=0
+@@ -135,13 +129,13 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ ! -d $ORACLE_HOME ]; then
+ echo $ECHOOPT "No Oracle Client found: "
+- $FAILURE "No Oracle Client found: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client found: "
+ RETVAL=1
+ fi
+
+@@ -159,11 +153,12 @@
+ ORACLECLIENT=`ldconfig -p | grep libclntsh`
+ if [ "x${ORACLECLIENT}" == "x" ]; then
+ echo $ECHOOPT "No Oracle Client installed: "
+- $FAILURE "No Oracle Client installed: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "No Oracle Client installed: "
+ RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV2DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
+@@ -181,10 +176,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv2.2 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv2.2 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -193,72 +188,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv2.2 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 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 "srmv2.2 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -270,7 +242,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -279,15 +251,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)
+diff -ur lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.postgresql lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.postgresql
+--- lcgdm-1.8.0.1.orig/srmv2.2/srmv2.2.scripts.postgresql 2010-12-20 11:39:55.000000000 +0100
++++ lcgdm-1.8.0.1/srmv2.2/srmv2.2.scripts.postgresql 2010-12-29 12:52:43.203485992 +0100
+@@ -43,7 +43,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
+@@ -102,14 +102,8 @@
+ X509_USER_KEY=/etc/grid-security/$DPMUSER/dpmkey.pem
+ export X509_USER_KEY
+
+- echo $ECHOOPT "Starting $prog: "
+- if [ $sysname = "Linux" -a `whoami` = "root" ]; then
+- netstat -ap | egrep '\*:8446|\*:srmv2.2' | grep LISTEN | grep srmv2.2 > /dev/null
+- else
+- netstat -a | egrep '\*[:.]8446|\*[:.]srmv2.2' | egrep 'LISTEN *$' > /dev/null
+- fi
+- # ps -eo ppid,$format4comm | egrep '^[ \t]+1 srmv2.2' > /dev/null
+- if [ $? -eq 0 ]; then
++ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
++ if [ -n "$pid" ]; then
+ echo $ECHOOPT "srmv2.2 already started: "
+ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already started: "
+ RETVAL=0
+@@ -133,11 +127,12 @@
+ fi
+ fi
+ if [ ! -s "$DPMCONFIGFILE" ]; then
+- echo "FAILED : config file $DPMCONFIGFILE empty"
++ echo $ECHOOPT "config file $DPMCONFIGFILE empty: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "config file $DPMCONFIGFILE empty: "
+ RETVAL=1
+- exit $RETVAL
+ fi
+ if [ $RETVAL -eq 0 ]; then
++ echo $ECHOOPT "Starting $prog: "
+ cd /
+ mkdir -p `dirname $SRMV2DAEMONLOGFILE`
+ chown $DPMUSER:$DPMGROUP `dirname $SRMV2DAEMONLOGFILE`
+@@ -155,10 +150,10 @@
+ rm -f $PIDFILE
+ echo $pid > $PIDFILE
+ fi
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Starting $prog: "
+ RETVAL=0
+ else
+- echo $ECHOOPT "srmv2.2 not started: "
+- [ -n "$FAILURE" ] && $FAILURE "srmv2.2 not started: "
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Starting $prog: "
+ RETVAL=1
+ fi
+ fi
+@@ -167,72 +162,49 @@
+ ;;
+ stop)
+ if [ -f $PIDFILE ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -`cat $PIDFILE`
+- else
+- kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+- fi
++ kill -2 -`cat $PIDFILE` > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ 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
+ # srmv2.2 might have been started by hand
+ pid=`ps -eo pid,ppid,$format4comm | grep " 1 srmv2.2$" | awk '{print $1}'`
+ if [ -n "$pid" ]; then
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "Stopping $prog: "
++ echo $ECHOOPT "Stopping $prog: "
+ if [ -x $SRMV2SHUTDOWN ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- $SRMV2SHUTDOWN -f -h `hostname`
+- else
+- $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+- fi
++ $SRMV2SHUTDOWN -f -h `hostname` > /dev/null 2>&1
+ RETVAL=$?
+ if [ $RETVAL -ne 0 ]; then
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
+ else
+- if [ $SILENTSTOP -eq 0 ]; then
+- kill -2 -$pid
+- else
+- kill -2 -$pid > /dev/null 2>&1
+- fi
++ kill -2 -$pid > /dev/null 2>&1
+ RETVAL=$?
+ fi
++ if [ $RETVAL -eq 0 ]; then
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "Stopping $prog: "
++ else
++ [ -n "$ECHO_FAILURE" ] && $ECHO_FAILURE "Stopping $prog: "
++ fi
+ else
+- [ $SILENTSTOP -eq 0 ] && echo $ECHOOPT "srmv2.2 already stopped: "
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 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 "srmv2.2 already stopped: "
++ [ -n "$ECHO_SUCCESS" ] && $ECHO_SUCCESS "srmv2.2 already stopped: "
++ [ $SILENTSTOP -eq 0 ] && RETVAL=0 || RETVAL=1
+ fi
+ fi
+
+@@ -244,7 +216,7 @@
+ done
+
+ [ -d $SUBSYSDIR ] && rm -f $SUBSYS
+- [ $SILENTSTOP -eq 0 -a -n "$ECHO_END" ] && $ECHO_END
++ $ECHO_END
+ ;;
+ restart | force-reload)
+ $0 stop
+@@ -253,15 +225,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)
diff --git a/lcgdm.spec b/lcgdm.spec
index e1f648e..a6e7324 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -27,7 +27,7 @@
Name: lcgdm
Version: 1.8.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: LHC Computing Grid Data Management
Group: System Environment/Libraries
@@ -66,12 +66,14 @@ Patch6: %{name}-race.patch
# Remove deprecated python function:
# https://savannah.cern.ch/bugs/?69232
Patch7: %{name}-python-exception.patch
+# Make condrestart work as expected
+Patch8: %{name}-condrestart.patch
# Adapt upstream's hardcoded include and library paths for Fedora
-Patch8: %{name}-usr.patch
+Patch9: %{name}-usr.patch
# Allow moving plugins out of default library search path
-Patch9: %{name}-dlopen.patch
+Patch10: %{name}-dlopen.patch
# Use Fedora's imake instead of bundled version
-Patch10: %{name}-imake.patch
+Patch11: %{name}-imake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
@@ -198,6 +200,7 @@ Provides: lfcdaemon = %{version}-%{release}
Requires: lfc%{?_isa} = %{version}-%{release}
Requires(pre): shadow-utils
+Requires(post): mysql
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -232,6 +235,7 @@ Provides: lfcdaemon = %{version}-%{release}
Requires: lfc%{?_isa} = %{version}-%{release}
Requires(pre): shadow-utils
+Requires(post): postgresql
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -340,6 +344,7 @@ Group: Applications/Internet
Requires: dpm-mysql%{?_isa} = %{version}-%{release}
Requires(pre): dpm-mysql
+Requires(post): mysql
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -464,6 +469,7 @@ Group: Applications/Internet
Requires: dpm-postgres%{?_isa} = %{version}-%{release}
Requires(pre): dpm-postgres
+Requires(post): postgresql
Requires(post): chkconfig
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -571,6 +577,7 @@ pushd $d/%{name}-%{version}
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
chmod 644 security/globus_gsi_gss_constants.h \
security/globus_i_gsi_credential.h \
@@ -1479,6 +1486,60 @@ getent passwd lfcmgr > /dev/null || useradd -r -g lfcmgr \
exit 0
%post -n lfc-mysql
+updatelfc () {
+ [ -r /etc/sysconfig/lfcdaemon ] && . /etc/sysconfig/lfcdaemon
+ [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/NSCONFIG
+ [ -r $NSCONFIGFILE ] || return 0
+
+ nscfg=$(cat $NSCONFIGFILE)
+
+ cfg1=$(echo $nscfg | cut -f1 -d@)
+ cfg2=$(echo $nscfg | cut -f2 -d@ -s)
+
+ user=$(echo $cfg1 | cut -f1 -d/)
+ passwd=$(echo $cfg1 | cut -f2 -d/ -s)
+ host=$(echo $cfg2 | cut -f1 -d/)
+ db=$(echo $cfg2 | cut -f2 -d/ -s)
+
+ [ -z "$user" ] && return 0
+ [ -z "$passwd" ] && return 0
+ [ -z "$host" ] && return 0
+ [ -z "$db" ] && db=cns_db
+
+ mycfg=$(mktemp)
+ cat > $mycfg <<-EOF
+ [client]
+ user=$user
+ password=$passwd
+ EOF
+
+ mysql="mysql --defaults-file=$mycfg --skip-column-names $db"
+
+ vmajor=$($mysql -e "select major from schema_version" 2>/dev/null)
+ vminor=$($mysql -e "select minor from schema_version" 2>/dev/null)
+ vpatch=$($mysql -e "select patch from schema_version" 2>/dev/null)
+
+ if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
+ rm $mycfg
+ return 0
+ fi
+
+ if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
+ $mysql <<-EOF
+ ALTER TABLE Cns_groupinfo ADD banned INTEGER;
+ ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255) BINARY;
+ ALTER TABLE Cns_userinfo ADD banned INTEGER;
+ CREATE INDEX linkname_idx ON Cns_symlinks(linkname(255));
+ UPDATE schema_version SET major = 3, minor = 1, patch = 0;
+ EOF
+ fi
+
+ rm $mycfg
+ return 0
+}
+
+updatelfc
+
if [ $1 = 1 ]; then
/sbin/chkconfig --add lfc-mysql
fi
@@ -1511,6 +1572,8 @@ if [ $1 = 0 ]; then
fi
%postun -n lfc-mysql
+export LANG=C
+
if [ $1 -ge 1 ]; then
%{_sbindir}/update-alternatives --display lfcdaemon | \
grep currently | grep -q lfc-mysql && \
@@ -1540,6 +1603,52 @@ getent passwd lfcmgr > /dev/null || useradd -r -g lfcmgr \
exit 0
%post -n lfc-postgres
+updatelfc () {
+ [ -r /etc/sysconfig/lfcdaemon ] && . /etc/sysconfig/lfcdaemon
+ [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/NSCONFIG
+ [ -r $NSCONFIGFILE ] || return 0
+
+ nscfg=$(cat $NSCONFIGFILE)
+
+ cfg1=$(echo $nscfg | cut -f1 -d@)
+ cfg2=$(echo $nscfg | cut -f2 -d@ -s)
+
+ user=$(echo $cfg1 | cut -f1 -d/)
+ passwd=$(echo $cfg1 | cut -f2 -d/ -s)
+ host=$(echo $cfg2 | cut -f1 -d/)
+ db=$(echo $cfg2 | cut -f2 -d/ -s)
+
+ [ -z "$user" ] && return 0
+ [ -z "$passwd" ] && return 0
+ [ -z "$host" ] && return 0
+ [ -z "$db" ] && db=cns_db
+
+ export PGPASSWORD=$passwd
+ psql="psql -t -q -U $user $db"
+
+ vmajor=$($psql -c "select major from schema_version" 2>/dev/null)
+ vminor=$($psql -c "select minor from schema_version" 2>/dev/null)
+ vpatch=$($psql -c "select patch from schema_version" 2>/dev/null)
+
+ if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
+ return 0
+ fi
+
+ if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
+ $psql <<-EOF
+ ALTER TABLE Cns_groupinfo ADD banned INTEGER;
+ ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255);
+ ALTER TABLE Cns_userinfo ADD banned INTEGER;
+ CREATE INDEX linkname_idx ON Cns_symlinks(linkname);
+ UPDATE schema_version SET major = 3, minor = 1, patch = 0;
+ EOF
+ fi
+
+ return 0
+}
+
+updatelfc
+
if [ $1 = 1 ]; then
/sbin/chkconfig --add lfc-postgres
fi
@@ -1572,6 +1681,8 @@ if [ $1 = 0 ]; then
fi
%postun -n lfc-postgres
+export LANG=C
+
if [ $1 -ge 1 ]; then
%{_sbindir}/update-alternatives --display lfcdaemon | \
grep currently | grep -q lfc-postgres && \
@@ -1617,11 +1728,69 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-mysql
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-mysql condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm | \
+ grep currently | grep -q dpm-mysql && \
+ /sbin/service dpm-mysql condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-mysql-nameserver
+updatedpns () {
+ [ -r /etc/sysconfig/dpnsdaemon ] && . /etc/sysconfig/dpnsdaemon
+ [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/DPNSCONFIG
+ [ -r $NSCONFIGFILE ] || return 0
+
+ nscfg=$(cat $NSCONFIGFILE)
+
+ cfg1=$(echo $nscfg | cut -f1 -d@)
+ cfg2=$(echo $nscfg | cut -f2 -d@ -s)
+
+ user=$(echo $cfg1 | cut -f1 -d/)
+ passwd=$(echo $cfg1 | cut -f2 -d/ -s)
+ host=$(echo $cfg2 | cut -f1 -d/)
+ db=$(echo $cfg2 | cut -f2 -d/ -s)
+
+ [ -z "$user" ] && return 0
+ [ -z "$passwd" ] && return 0
+ [ -z "$host" ] && return 0
+ [ -z "$db" ] && db=cns_db
+
+ mycfg=$(mktemp)
+ cat > $mycfg <<-EOF
+ [client]
+ user=$user
+ password=$passwd
+ EOF
+
+ mysql="mysql --defaults-file=$mycfg --skip-column-names $db"
+
+ vmajor=$($mysql -e "select major from schema_version" 2>/dev/null)
+ vminor=$($mysql -e "select minor from schema_version" 2>/dev/null)
+ vpatch=$($mysql -e "select patch from schema_version" 2>/dev/null)
+
+ if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
+ rm $mycfg
+ return 0
+ fi
+
+ if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
+ $mysql <<-EOF
+ ALTER TABLE Cns_groupinfo ADD banned INTEGER;
+ ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255) BINARY;
+ ALTER TABLE Cns_userinfo ADD banned INTEGER;
+ CREATE INDEX linkname_idx ON Cns_symlinks(linkname(255));
+ UPDATE schema_version SET major = 3, minor = 1, patch = 0;
+ EOF
+ fi
+
+ rm $mycfg
+ return 0
+}
+
+updatedpns
+
if [ $1 = 1 ]; then
/sbin/chkconfig --add dpm-mysql-nameserver
fi
@@ -1654,8 +1823,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-mysql-nameserver
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-mysql-nameserver condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpnsdaemon | \
+ grep currently | grep -q dpm-mysql && \
+ /sbin/service dpm-mysql-nameserver condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-mysql-copyd
@@ -1685,8 +1858,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-mysql-copyd
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-mysql-copyd condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpmcopyd | \
+ grep currently | grep -q dpm-mysql && \
+ /sbin/service dpm-mysql-copyd condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-mysql-srmv1
@@ -1716,8 +1893,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-mysql-srmv1
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-mysql-srmv1 condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm-srmv1 | \
+ grep currently | grep -q dpm-mysql && \
+ /sbin/service dpm-mysql-srmv1 condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-mysql-srmv2
@@ -1747,8 +1928,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-mysql-srmv2
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-mysql-srmv2 condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm-srmv2 | \
+ grep currently | grep -q dpm-mysql && \
+ /sbin/service dpm-mysql-srmv2 condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-mysql-srmv22
@@ -1778,8 +1963,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-mysql-srmv22
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-mysql-srmv22 condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm-srmv2.2 | \
+ grep currently | grep -q dpm-mysql && \
+ /sbin/service dpm-mysql-srmv22 condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-rfiod
@@ -1838,11 +2027,61 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-postgres
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-postgres condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm | \
+ grep currently | grep -q dpm-postgres && \
+ /sbin/service dpm-postgres condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-postgres-nameserver
+updatedpns () {
+ [ -r /etc/sysconfig/dpnsdaemon ] && . /etc/sysconfig/dpnsdaemon
+ [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/DPNSCONFIG
+ [ -r $NSCONFIGFILE ] || return 0
+
+ nscfg=$(cat $NSCONFIGFILE)
+
+ cfg1=$(echo $nscfg | cut -f1 -d@)
+ cfg2=$(echo $nscfg | cut -f2 -d@ -s)
+
+ user=$(echo $cfg1 | cut -f1 -d/)
+ passwd=$(echo $cfg1 | cut -f2 -d/ -s)
+ host=$(echo $cfg2 | cut -f1 -d/)
+ db=$(echo $cfg2 | cut -f2 -d/ -s)
+
+ [ -z "$user" ] && return 0
+ [ -z "$passwd" ] && return 0
+ [ -z "$host" ] && return 0
+ [ -z "$db" ] && db=cns_db
+
+ export PGPASSWORD=$passwd
+ psql="psql -t -q -U $user $db"
+
+ vmajor=$($psql -c "select major from schema_version" 2>/dev/null)
+ vminor=$($psql -c "select minor from schema_version" 2>/dev/null)
+ vpatch=$($psql -c "select patch from schema_version" 2>/dev/null)
+
+ if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
+ return 0
+ fi
+
+ if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
+ $psql <<-EOF
+ ALTER TABLE Cns_groupinfo ADD banned INTEGER;
+ ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255);
+ ALTER TABLE Cns_userinfo ADD banned INTEGER;
+ CREATE INDEX linkname_idx ON Cns_symlinks(linkname);
+ UPDATE schema_version SET major = 3, minor = 1, patch = 0;
+ EOF
+ fi
+
+ return 0
+}
+
+updatedpns
+
if [ $1 = 1 ]; then
/sbin/chkconfig --add dpm-postgres-nameserver
fi
@@ -1875,8 +2114,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-postgres-nameserver
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-postgres-nameserver condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpnsdaemon | \
+ grep currently | grep -q dpm-postgres && \
+ /sbin/service dpm-postgres-nameserver condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-postgres-copyd
@@ -1906,8 +2149,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-postgres-copyd
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-postgres-copyd condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpmcopyd | \
+ grep currently | grep -q dpm-postgres && \
+ /sbin/service dpm-postgres-copyd condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-postgres-srmv1
@@ -1937,8 +2184,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-postgres-srmv1
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-postgres-srmv1 condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm-srmv1 | \
+ grep currently | grep -q dpm-postgres && \
+ /sbin/service dpm-postgres-srmv1 condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-postgres-srmv2
@@ -1968,8 +2219,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-postgres-srmv2
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-postgres-srmv2 condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm-srmv2 | \
+ grep currently | grep -q dpm-postgres && \
+ /sbin/service dpm-postgres-srmv2 condrestart > /dev/null 2>&1 || :
fi
%post -n dpm-postgres-srmv22
@@ -1999,8 +2254,12 @@ if [ $1 = 0 ]; then
fi
%postun -n dpm-postgres-srmv22
+export LANG=C
+
if [ $1 -ge 1 ]; then
- /sbin/service dpm-postgres-srmv22 condrestart > /dev/null 2>&1 || :
+ %{_sbindir}/update-alternatives --display dpm-srmv2.2 | \
+ grep currently | grep -q dpm-postgres && \
+ /sbin/service dpm-postgres-srmv22 condrestart > /dev/null 2>&1 || :
fi
%files
@@ -2406,6 +2665,10 @@ fi
%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
%changelog
+* Mon Dec 27 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.0.1-3
+- Add database schema migration to scriptlets
+- Fix broken condrestart action in start-up scripts
+
* Mon Dec 20 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.0.1-2
- Filter private provides from python
More information about the scm-commits
mailing list