[Ocfs2-tools-commits] jlbec commits r518 - trunk/vendor/common

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-12-29 12:10:30 -0600 (Wed, 29 Dec 2004)
New Revision: 518

Modified:
   trunk/vendor/common/
   trunk/vendor/common/o2cb.init
Log:

o o2cb.init seems to work.  This commit fixes the 'status' option.




Property changes on: trunk/vendor/common
___________________________________________________________________
Name: svn:ignore
   - ocfs2-tools.spec

   + ocfs2-tools.spec
.*.sw?


Modified: trunk/vendor/common/o2cb.init
===================================================================
--- trunk/vendor/common/o2cb.init	2004-12-29 17:54:50 UTC (rev 517)
+++ trunk/vendor/common/o2cb.init	2004-12-29 18:10:30 UTC (rev 518)
@@ -305,7 +305,7 @@
 status()
 {
     echo -n "Checking if O2CB is loaded: "
-    RC=2
+    RC=0
     for MODSPEC in $MODULE_LIST
     do
         MODULE_NAME="$(echo $MODSPEC | cut -d: -f1)"
@@ -314,7 +314,7 @@
 
         if grep "^${MODULE_NAME} " /proc/modules >/dev/null 2>&1
         then
-            echo -n "${MODULE_NAME}"
+            echo -n "${MODULE_NAME} "
         else
             RC=1
             break
@@ -328,12 +328,17 @@
         MODULE_NAME="$(echo $MODSPEC | cut -d: -f1)"
         FSTYPE="$(echo $MODSPEC | cut -d: -f2)"
         MOUNT_POINT="$(echo $MODSPEC | cut -d: -f3)"
+
+        if [ -z "$FSTYPE" -o -z "$MOUNT_POINT" ]
+        then
+            continue
+        fi
+
         FULL_MOUNT="${O2CB_MANAGER}/${MOUNT_POINT}"
-
         FULL_MOUNTSEARCH="`echo "$FULL_MOUNT" | sed -e 's/\//\\\\\//g'`"
         if grep "^${FSTYPE} ${FULL_MOUNTSEARCH} ${FSTYPE}" /proc/mounts >/dev/null 2>&1
         then
-            echo -n "${MOUNT_POINT}"
+            echo -n "${MOUNT_POINT} "
         else
             RC=1
             break