LU-16335 test: add fail_abort_cleanup()

[fs/lustre-release.git] / lustre / scripts / lustre

diff --git a/lustre/scripts/lustre b/lustre/scripts/lustre
index f258cb4..a615b74 100644 (file)
--- a/lustre/scripts/lustre
+++ b/lustre/scripts/lustre
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # lustre       This shell script takes care of starting and stopping
-#              the lustre services.
+#             the lustre services.
 #
 # chkconfig: - 60 20
 # description:  Part of the lustre file system.
@@ -9,7 +9,7 @@
 # config: /etc/sysconfig/lustre
 ### BEGIN INIT INFO
 # Provides: lustre
-# Required-Start: openibd
+# Required-Start: lnet
 # Defalt-Start: -
 # Default-Stop: 0 1 6
 # Description: Lustre init script
@@ -455,13 +455,14 @@ start_services ()
                        assemble_md_device $journal $raidtab 2>/dev/null
                fi
 
+               if mountpt_is_active $label || \
+                  device_is_active $label; then
+                       echo "$label is already mounted"
+                       # no error
+                       continue
+               fi
+
                if [ "x$devtype" != "xzfs" ] ; then
-                       if mountpt_is_active $label || \
-                          device_is_active $label; then
-                               echo "$label is already mounted"
-                               # no error
-                               continue
-                       fi
                        if ! mmp_test $dev; then
                                result=2
                                continue