[Ocfs2-tools-commits] jlbec commits r1372 - branches/cman-based/vendor/common

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Tue Jul 24 15:04:29 PDT 2007


Author: jlbec
Date: 2007-07-24 15:04:28 -0700 (Tue, 24 Jul 2007)
New Revision: 1372

Modified:
   branches/cman-based/vendor/common/o2cb.init
Log:

o2cb.init also had the problem of reading /cluster and not checking only
for directories.



Modified: branches/cman-based/vendor/common/o2cb.init
===================================================================
--- branches/cman-based/vendor/common/o2cb.init	2007-07-24 21:55:05 UTC (rev 1371)
+++ branches/cman-based/vendor/common/o2cb.init	2007-07-24 22:04:28 UTC (rev 1372)
@@ -850,8 +850,12 @@
     then
         ls -1 $(configfs_path)/cluster/ | while read CLUSTER
         do
-            echo "Unable to unload modules as O2CB cluster ${CLUSTER} is still online" >&2
-            exit 1
+            if [ ! -L "$(configfs_path)/cluster/${CLUSTER}" -a \
+                 -d "$(configfs_path)/cluster/${CLUSTER}" ]
+            then
+                echo "Unable to unload modules as O2CB cluster ${CLUSTER} is still online" >&2
+                exit 1
+            fi
         done
         if [ $? = 1 ]
         then




More information about the Ocfs2-tools-commits mailing list