From 8602cba2383d77b24b3c1dd4c0c2c432777708b5 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Mon, 21 Apr 2014 09:22:15 +0000
Subject: [PATCH] While we don't recommend using ext2fs, the directions for
 doing so shouldn't be misleading

ok krw@
---
 sbin/newfs_ext2fs/newfs_ext2fs.8 | 8 ++++----
 sbin/newfs_ext2fs/newfs_ext2fs.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sbin/newfs_ext2fs/newfs_ext2fs.8 b/sbin/newfs_ext2fs/newfs_ext2fs.8
index ab5610163ff..1b63611e1cf 100644
--- a/sbin/newfs_ext2fs/newfs_ext2fs.8
+++ b/sbin/newfs_ext2fs/newfs_ext2fs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newfs_ext2fs.8,v 1.7 2013/07/16 09:45:28 schwarze Exp $
+.\"	$OpenBSD: newfs_ext2fs.8,v 1.8 2014/04/21 09:22:15 guenther Exp $
 .\"	$NetBSD: newfs_ext2fs.8,v 1.7 2009/12/01 08:47:25 pooka Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
 .\"
-.Dd $Mdocdate: July 16 2013 $
+.Dd $Mdocdate: April 21 2014 $
 .Dt NEWFS_EXT2FS 8
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@ because the current ext2fs
 implementation doesn't support fragmentation.
 .It Fl I
 Do not require that the file system type listed in the disk label is
-.Ql Linux Ext2 .
+.Ql ext2fs .
 .It Fl i Ar bytes-per-inode
 This specifies the density of inodes in the file system.
 If fewer inodes are desired, a larger number should be used;
@@ -272,7 +272,7 @@ For the
 command to succeed,
 the disk label should first be updated such that the fstype field for the
 partition is set to
-.Ql Linux Ext2 ,
+.Ql ext2fs ,
 unless
 .Fl F
 or
diff --git a/sbin/newfs_ext2fs/newfs_ext2fs.c b/sbin/newfs_ext2fs/newfs_ext2fs.c
index a1bb4e0d5f6..00f1bda3469 100644
--- a/sbin/newfs_ext2fs/newfs_ext2fs.c
+++ b/sbin/newfs_ext2fs/newfs_ext2fs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: newfs_ext2fs.c,v 1.9 2013/11/22 04:14:01 deraadt Exp $ */
+/* $OpenBSD: newfs_ext2fs.c,v 1.10 2014/04/21 09:22:15 guenther Exp $ */
 /*	$NetBSD: newfs_ext2fs.c,v 1.8 2009/03/02 10:38:13 tsutsui Exp $	*/
 
 /*
@@ -298,7 +298,7 @@ main(int argc, char *argv[])
 			static const char m[] =
 			    "%s partition type is not `%s' (or use -I)";
 			if (pp->p_fstype != FS_EXT2FS)
-				errx(EXIT_FAILURE, m, special, "Linux Ext2");
+				errx(EXIT_FAILURE, m, special, "ext2fs");
 		}
 		if (sectorsize == 0) {
 			sectorsize = lp->d_secsize;
@@ -452,7 +452,7 @@ static const char help_strings[] =
 	"\t-D inodesize\tsize of an inode in bytes (128 or 256)\n"
 	"\t-F \t\tcreate file system image in regular file\n"
 	"\t-f fsize\tfragment size\n"
-	"\t-I \t\tdo not check that the file system type is `Linux Ext2'\n"
+	"\t-I \t\tdo not check that the file system type is `ext2fs'\n"
 	"\t-i density\tnumber of bytes per inode\n"
 	"\t-m minfree\tminimum free space %\n"
 	"\t-N \t\tdo not create file system, just print out parameters\n"
-- 
2.20.1