handle running from numbered RC scripts, and exit if no configuration is present

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index ac13779..63e9660 100755 (executable)
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -22,7 +22,6 @@
 
 
 SERVICE=${0##*/}
-LOCK=/var/lock/subsys/$SERVICE
 
 : ${LUSTRE_CFG:=/etc/lustre/lustre.cfg}
 [ -f ${LUSTRE_CFG} ] && . ${LUSTRE_CFG}
@@ -33,7 +32,8 @@ LOCK=/var/lock/subsys/$SERVICE
 : ${LCTL:=/usr/sbin/lctl}
 
 case "$SERVICE" in
-    lustre)
+    [SK][[:digit:]][[:digit:]]lustre | lustre)
+        SERVICE="lustre"
        : ${LCONF_START_ARGS:="${LUSTRE_CONFIG_XML}"}
        : ${LCONF_STOP_ARGS:="--force --cleanup ${LUSTRE_CONFIG_XML}"}
        ;;
@@ -42,6 +42,7 @@ case "$SERVICE" in
        : ${LCONF_STOP_ARGS:="--group ${SERVICE} --select ${SERVICE}=${HOSTNAME} --failover --cleanup ${LUSTRE_CONFIG_XML}"}
        ;;
 esac
+LOCK=/var/lock/subsys/$SERVICE
 
 # Source function library.
 if [ -f /etc/init.d/functions ] ; then
@@ -62,7 +63,7 @@ check_start_stop() {
        if [ ${LUSTRE_CONFIG_XML:0:1} = "/" ] ; then
                 if [ ! -f ${LUSTRE_CONFIG_XML} ] ; then
                     echo "${0##*/}: Configuration file ${LUSTRE_CONFIG_XML} not found; skipping."
-                    echo 0
+                    exit 0
                 fi
        fi