Branch b1_4_mountconf

b=8007
don't set default mount opts if user specifies their own

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index b07e233..f2bba1f 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -1089,9 +1089,10 @@ int main(int argc, char *const argv[])
 
 #ifndef TUNEFS /* mkfs.lustre */
         if (mountopts) 
-                /* Tack on user supplied opts */
-                sprintf(mop.mo_ldd.ldd_mount_opts, "%s,%s", 
-                        default_mountopts, mountopts);
+                /* If user specifies mount opts, assume no defaults */
+                strcpy(mop.mo_ldd.ldd_mount_opts, mountopts);
+                /* sprintf(mop.mo_ldd.ldd_mount_opts, "%s,%s", 
+                        default_mountopts, mountopts); */
         else
                 strcpy(mop.mo_ldd.ldd_mount_opts, default_mountopts);
 #else   /* tunefs.lustre - if mountopts are specified, they override