From 4ab9c1d126f5862a442160a908aa9447ce021ac6 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Wed, 24 Apr 2002 12:27:03 +0000
Subject: [PATCH] Remove the -v option, it is now default behaviour.

Sponsored by:	DARPA & NAI Labs
---
 sbin/newfs/newfs.8 |  7 -------
 sbin/newfs/newfs.c | 15 +++++----------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index dfcb9a146930..80c30c3c2374 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -55,7 +55,6 @@
 .Op Fl o Ar optimization
 .Op Fl s Ar size
 .Op Fl u Ar sectors
-.Op Fl v
 .Ar special
 .Sh DESCRIPTION
 .Nm Newfs
@@ -163,12 +162,6 @@ raw partition specified in
 (in other words,
 .Nm
 will use the entire partition for the file system).
-.It Fl v
-Specify that the disk does not contain any partitions, and that
-.Nm
-should build a file system on the whole disk.
-This option is useful for synthetic disks such as
-.Nm vinum .
 .El
 .Pp
 The following options override the standard sizes for the disk geometry.
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c
index ed8073a3d35b..efb468692d10 100644
--- a/sbin/newfs/newfs.c
+++ b/sbin/newfs/newfs.c
@@ -151,13 +151,11 @@ main(int argc, char *argv[])
 	struct partition oldpartition;
 	struct stat st;
 	char *cp, *special;
-	int ch, n, vflag;
+	int ch, n;
 	off_t mediasize;
 
-	vflag = 0;
-
 	while ((ch = getopt(argc, argv,
-	    "NRS:T:Ua:b:c:e:f:g:h:i:m:o:s:u:v:")) != -1)
+	    "NRS:T:Ua:b:c:e:f:g:h:i:m:o:s:u:")) != -1)
 		switch (ch) {
 		case 'N':
 			Nflag = 1;
@@ -234,9 +232,6 @@ main(int argc, char *argv[])
 				errx(1, "%s: bad sectors/track", optarg);
 			secpercyl = n;
 			break;
-		case 'v':
-			vflag = 1;
-			break;
 		case '?':
 		default:
 			usage();
@@ -279,11 +274,11 @@ main(int argc, char *argv[])
 	if (lp != NULL) {
 		cp = strchr(special, '\0');
 		cp--;
-		if (!vflag && (*cp < 'a' || *cp > 'h') && !isdigit(*cp))
+		if ((*cp < 'a' || *cp > 'h') && !isdigit(*cp))
 			errx(1, "%s: can't figure out file system partition",
 			    special);
-		if (vflag || isdigit(*cp))
-			pp = &lp->d_partitions[0];
+		if (isdigit(*cp))
+			pp = &lp->d_partitions[RAW_PART];
 		else
 			pp = &lp->d_partitions[*cp - 'a'];
 		oldpartition = *pp;