Branch b1_5

b=8007
remove lmc and lconf man pages
allow setting fsname before target type

diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index 2b214f7..07766a7 100644 (file)
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -15,7 +15,7 @@ TEXEXPAND = texexpand
 SUFFIXES = .lin .lyx .pdf .ps .sgml .html .txt .tex .fig .eps .dvi
 
 if UTILS
-man_MANS = lfs.1 lmc.1 lconf.8 lctl.8
+man_MANS = lfs.1 lctl.8
 endif
 
 LYXFILES= $(filter-out $(patsubst %.lin,%.lyx,$(wildcard *.lin)),\
@@ -24,7 +24,7 @@ LYXFILES= $(filter-out $(patsubst %.lin,%.lyx,$(wildcard *.lin)),\
 CLEANFILES = *.aux *.tex *.log *.pdf
 
 EXTRA_DIST = tex2pdf $(man_MANS) \
-       $(LYXFILES) lfs.1 lmc.1 lconf.8 lctl.8  
+       $(LYXFILES) lfs.1 lctl.8        
 
 all:
 

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index e9eff0c..a93bebe 100644 (file)
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -981,10 +981,6 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
                                 sizeof(mop->mo_mkfsopts) - 1);
                         break;
                 case 'L':
-                        if (!(IS_MDT(&mop->mo_ldd) || IS_OST(&mop->mo_ldd))) {
-                                badopt(long_opt[longidx].name, "MDT,OST");
-                                return 1;
-                        }
                         if (strlen(optarg) > 8) {
                                 fprintf(stderr, "%s: filesystem name must be "
                                         "<= 8 chars\n", progname);