From 1253fe1ead6043e8757fcdc0d00f78320a9e9704 Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Tue, 20 Feb 2007 21:04:12 +0000
Subject: [PATCH] Make attach the default for -f. That way

	mdconfig -f image

works like a charm.

Reviewed by:	phk (some time ago)
MFC:		1 week
---
 sbin/mdconfig/mdconfig.8 | 8 ++++++--
 sbin/mdconfig/mdconfig.c | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 7e722752cfb1..3de3af8d0bb7 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -195,10 +195,14 @@ mount /dev/md10 /tmp
 chmod 1777 /tmp
 .Ed
 .Pp
-To create a 5MB file-backed disk:
+To create a 5MB file-backed disk (
+.Fl -a
+and
+.Fl -t Ar vnode
+are implied):
 .Bd -literal -offset indent
 dd if=/dev/zero of=somebackingfile bs=1k count=5k
-mdconfig -a -t vnode -f somebackingfile -u 0
+mdconfig -f somebackingfile -u 0
 bsdlabel -w md0 auto
 newfs md0c
 mount /dev/md0c /mnt
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index acf3ff2b7985..4fc580c115f8 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -130,8 +130,12 @@ main(int argc, char **argv)
 			cmdline=2;
 			break;
 		case 'f':
-			if (cmdline != 1 && cmdline != 2)
+			if (cmdline != 0 && cmdline != 1 && cmdline != 2)
 				usage();
+			if (cmdline == 0) {
+				action = ATTACH;
+				cmdline = 1;
+			}
 			if (cmdline == 1) {
 				/* Imply ``-t vnode'' */
 				mdio.md_type = MD_VNODE;