Attachment #35761 for bug #57641

View | Details | Raw Unified | Return to bug 57641
Collapse All | Expand All

Lines 36-42 Link Here

(-)sbin/mdmfs/mdmfs.8 (-2 / +7 lines)
36	driver	36	driver
37	.Sh SYNOPSIS	37	.Sh SYNOPSIS
38	.Nm	38	.Nm
39	.Op Fl DLMNSUX	39	.Op Fl DLMNPSUX
40	.Op Fl a Ar maxcontig	40	.Op Fl a Ar maxcontig
41	.Op Fl b Ar block-size	41	.Op Fl b Ar block-size
42	.Op Fl c Ar cylinders	42	.Op Fl c Ar cylinders
Lines 57-63 Link Here
57	.Ar mount-point	57	.Ar mount-point
58	.Nm	58	.Nm
59	.Fl C	59	.Fl C
60	.Op Fl NU	60	.Op Fl NPU
61	.Op Fl a Ar maxcontig	61	.Op Fl a Ar maxcontig
62	.Op Fl b Ar block-size	62	.Op Fl b Ar block-size
63	.Op Fl c Ar cylinders	63	.Op Fl c Ar cylinders
Lines 195-200 Link Here
195	See	195	See
196	.Xr mount 8	196	.Xr mount 8
197	for more information.	197	for more information.
		198	.It Fl P
		199	Preserve existing filesystem. Do not run newfs. This only makes sense if
		200	.Fl F
		201	is specified
		202	.Pq Dv MD_VNODE .
198	.It Fl p Ar permissions	203	.It Fl p Ar permissions
199	Set the file (directory) permissions of the mount point	204	Set the file (directory) permissions of the mount point
200	.Ar mount-point	205	.Ar mount-point




	    *mount_arg;
	enum md_types mdtype;		/* The type of our memory disk. */
	bool have_mdtype;
	bool detach, softdep, autounit, no_newfs;
	char *mtpoint, *unitstr;
	char ch, *p;
	void *set;

	detach = true;
	softdep = true;
	autounit = false;
	no_newfs = false;
	have_mdtype = false;
	mdname = MD_NAME;
	mdnamelen = strlen(mdname);

		compat = true;

	while ((ch = getopt(argc, argv,
	    "a:b:Cc:Dd:e:F:f:hi:LMm:Nn:O:o:Pp:Ss:t:Uv:w:X")) != -1)
		switch (ch) {
		case 'a':
			argappend(&newfs_arg, "-a %s", optarg);

		case 'o':
			argappend(&mount_arg, "-o %s", optarg);
			break;
		case 'P':
			no_newfs = true;
			break;
		case 'p':
			if (compat)
				usage();

		do_mdconfig_attach_au(mdconfig_arg, mdtype);
	else
		do_mdconfig_attach(mdconfig_arg, mdtype);
	if (!no_newfs || (mdtype != MD_VNODE))
		do_newfs(newfs_arg);
	do_mount(mount_arg, mtpoint);
	do_mtptsetup(mtpoint, &mi);


		name = "mdmfs";
	if (!compat)
		fprintf(stderr,
"usage: %s [-DLMNPSUX] [-a maxcontig [-b block-size] [-c cylinders]\n"
"\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"
"\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"
"\t[-o mount-options] [-p permissions] [-s size] [-w user:group]\n"
"\tmd-device mount-point\n", name);
	fprintf(stderr,
"usage: %s -C [-NPU] [-a maxcontig] [-b block-size] [-c cylinders]\n"
"\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"
"\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"
"\t[-o mount-options] [-s size] md-device mount-point\n", name);

Return to bug 57641

Lines 89-95 Link Here

(-)sbin/mdmfs/mdmfs.c (-5 / +10 lines)
89	*mount_arg;	89	*mount_arg;
90	enum md_types mdtype; /* The type of our memory disk. */	90	enum md_types mdtype; /* The type of our memory disk. */
91	bool have_mdtype;	91	bool have_mdtype;
92	bool detach, softdep, autounit;	92	bool detach, softdep, autounit, no_newfs;
93	char mtpoint, unitstr;	93	char mtpoint, unitstr;
94	char ch, *p;	94	char ch, *p;
95	void *set;	95	void *set;
Lines 99-104 Link Here
99	detach = true;	99	detach = true;
100	softdep = true;	100	softdep = true;
101	autounit = false;	101	autounit = false;
		102	no_newfs = false;
102	have_mdtype = false;	103	have_mdtype = false;
103	mdname = MD_NAME;	104	mdname = MD_NAME;
104	mdnamelen = strlen(mdname);	105	mdnamelen = strlen(mdname);
Lines 118-124 Link Here
118	compat = true;	119	compat = true;
119		120
120	while ((ch = getopt(argc, argv,	121	while ((ch = getopt(argc, argv,
121	"a:b:Cc:Dd:e:F:f:hi:LMm:Nn:O:o:p:Ss:t:Uv:w:X")) != -1)	122	"a:b:Cc:Dd:e:F:f:hi:LMm:Nn:O:o:Pp:Ss:t:Uv:w:X")) != -1)
122	switch (ch) {	123	switch (ch) {
123	case 'a':	124	case 'a':
124	argappend(&newfs_arg, "-a %s", optarg);	125	argappend(&newfs_arg, "-a %s", optarg);
Lines 189-194 Link Here
189	case 'o':	190	case 'o':
190	argappend(&mount_arg, "-o %s", optarg);	191	argappend(&mount_arg, "-o %s", optarg);
191	break;	192	break;
		193	case 'P':
		194	no_newfs = true;
		195	break;
192	case 'p':	196	case 'p':
193	if (compat)	197	if (compat)
194	usage();	198	usage();
Lines 264-270 Link Here
264	do_mdconfig_attach_au(mdconfig_arg, mdtype);	268	do_mdconfig_attach_au(mdconfig_arg, mdtype);
265	else	269	else
266	do_mdconfig_attach(mdconfig_arg, mdtype);	270	do_mdconfig_attach(mdconfig_arg, mdtype);
267	do_newfs(newfs_arg);	271	if (!no_newfs \|\| (mdtype != MD_VNODE))
		272	do_newfs(newfs_arg);
268	do_mount(mount_arg, mtpoint);	273	do_mount(mount_arg, mtpoint);
269	do_mtptsetup(mtpoint, &mi);	274	do_mtptsetup(mtpoint, &mi);
270		275
Lines 661-673 Link Here
661	name = "mdmfs";	666	name = "mdmfs";
662	if (!compat)	667	if (!compat)
663	fprintf(stderr,	668	fprintf(stderr,
664	"usage: %s [-DLMNSUX] [-a maxcontig [-b block-size] [-c cylinders]\n"	669	"usage: %s [-DLMNPSUX] [-a maxcontig [-b block-size] [-c cylinders]\n"
665	"\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"	670	"\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"
666	"\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"	671	"\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"
667	"\t[-o mount-options] [-p permissions] [-s size] [-w user:group]\n"	672	"\t[-o mount-options] [-p permissions] [-s size] [-w user:group]\n"
668	"\tmd-device mount-point\n", name);	673	"\tmd-device mount-point\n", name);
669	fprintf(stderr,	674	fprintf(stderr,
670	"usage: %s -C [-NU] [-a maxcontig] [-b block-size] [-c cylinders]\n"	675	"usage: %s -C [-NPU] [-a maxcontig] [-b block-size] [-c cylinders]\n"
671	"\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"	676	"\t[-d rotdelay] [-e maxbpg] [-F file] [-f frag-size] [-i bytes]\n"
672	"\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"	677	"\t[-m percent-free] [-n rotational-positions] [-O optimization]\n"
673	"\t[-o mount-options] [-s size] md-device mount-point\n", name);	678	"\t[-o mount-options] [-s size] md-device mount-point\n", name);