LU-7759 utils: build mount.lustre with libmount

[fs/lustre-release.git] / lustre / utils / mount_lustre.c

diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 167aa61..0b9cafd 100644 (file)
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -72,6 +72,12 @@
 #endif
 #endif
 
+#ifdef HAVE_LIBMOUNT
+# define WITH_LIBMOUNT "(libmount)"
+#else
+# define WITH_LIBMOUNT ""
+#endif
+
 #define MAXOPT 4096
 #define MAX_RETRIES 99
 
@@ -554,8 +560,8 @@ static int parse_opts(int argc, char *const argv[], struct mount_opts *mop)
                        break;
                case 'V':
                        ++version;
-                       fprintf(stdout, "%s %s\n", progname,
-                               LUSTRE_VERSION_STRING);
+                       fprintf(stdout, "%s %s %s\n", progname,
+                               LUSTRE_VERSION_STRING, WITH_LIBMOUNT);
                        return 0;
                default:
                        fprintf(stderr, "%s: unknown option '%c'\n",
@@ -806,9 +812,17 @@ int main(int argc, char *const argv[])
                                 rc = WEXITSTATUS(ret);
                 }
 
-       } else if (!mop.mo_nomtab) {
-               rc = update_mtab_entry(mop.mo_usource, mop.mo_target, "lustre",
-                                      mop.mo_orig_options, 0,0,0);
+       } else {
+               /* Deal with utab just for client. Note that we ignore
+                * the return value here since it is not worth to fail
+                * mount by prevent some rare cases */
+               if (strstr(mop.mo_usource, ":/") != NULL)
+                       update_utab_entry(&mop);
+               if (!mop.mo_nomtab) {
+                       rc = update_mtab_entry(mop.mo_usource, mop.mo_target,
+                                              "lustre", mop.mo_orig_options,
+                                              0, 0, 0);
+               }
        }
 
        free(options);