Remove "autounit" from settable options, it's the default unless you

specify -u.

Spotted by:	dcs

2 files changed, 3 insertions, 12 deletions

diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 09fbf44..b081be0 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -125,11 +125,6 @@ Allocate and reserve all needed storage from the start, rather than as needed.
 .Xc
 Enable clustering on this disk.
 .It Xo
-.Oo Cm no Oc Ns Cm autounit
-.Xc
-Automatically allocate the next free unit number for this disk.
-The basename of the disk is printed on stdout.
-.It Xo
 .Oo Cm no Oc Ns Cm compress
 .Xc
 Enable/Disable compression features to reduce memory usage.
@@ -139,9 +134,9 @@ Enable/Disable compression features to reduce memory usage.
 Enable/Disable readonly mode.
 .El
 .It Fl u Ar unit
-Force the
+Request a specific unit number for the
 .Xr md 4
-device to use a specific unit number.
+device instead of automatic allocation.
 .El
 .Sh EXAMPLES
 To create a 4 megabyte
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 2723cb6..231133f 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -41,7 +41,7 @@ usage()
 	fprintf(stderr, "\tmdconfig -d -u unit\n");
 	fprintf(stderr, "\tmdconfig -l [-u unit]\n");
 	fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n");
-	fprintf(stderr, "\t\toption = {cluster, compress, reserve, autounit}\n");
+	fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n");
 	fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%dk (kB), %%dm (MB) or %%dg (GB)\n");
 	exit(1);
 }
@@ -118,10 +118,6 @@ main(int argc, char **argv)
 				mdio.md_options |= MD_RESERVE;
 			else if (!strcmp(optarg, "noreserve"))
 				mdio.md_options &= ~MD_RESERVE;
-			else if (!strcmp(optarg, "autounit"))
-				mdio.md_options |= MD_AUTOUNIT;
-			else if (!strcmp(optarg, "noautounit"))
-				mdio.md_options &= ~MD_AUTOUNIT;
 			else
 				errx(1, "Unknown option.");
 			break;