From 58635e07d946589f7b3334cd89f252010f00e716 Mon Sep 17 00:00:00 2001
From: Thomas Nikolajsen <thomas@dragonflybsd.org>
Date: Wed, 23 Apr 2008 21:59:22 +0000
Subject: [PATCH] Add HAMMER to disklabel.8 Add cross references to
 mount_hammer.8 and hammer.8

When here add 'B' (Byte) to comment part of disklabel output, to make unit explicit.
---
 sbin/disklabel/disklabel.8       | 27 +++++++++++++++++----------
 sbin/disklabel/disklabel.c       |  4 ++--
 sbin/mount/mount.8               |  3 ++-
 sbin/mount_hammer/mount_hammer.8 |  3 ++-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 3db210ada3..9657e55887 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD: src/sbin/disklabel/disklabel.8,v 1.15.2.22 2003/04/17 17:56:34 trhodes Exp $
-.\" $DragonFly: src/sbin/disklabel/disklabel.8,v 1.18 2007/08/11 01:47:04 swildner Exp $
+.\" $DragonFly: src/sbin/disklabel/disklabel.8,v 1.19 2008/04/23 21:59:22 thomas Exp $
 .\"
 .Dd August 10, 2007
 .Dt DISKLABEL 8
@@ -554,8 +554,10 @@ Your mileage may vary.
 .Pa da0s1
 .Sh FILES
 .Bl -tag -width ".Pa /etc/disktab" -compact
-.It Pa /boot/boot
-Default boot image.
+.It Pa /boot/boot1
+Default stage1 boot image.
+.It Pa /boot/boot2
+Default stage2 boot image.
 .It Pa /etc/disktab
 Disk description file.
 .El
@@ -590,11 +592,12 @@ drivedata: 0
 
 16 partitions:
 #          size     offset    fstype
-  a:      81920          0    4.2BSD	#      40.000M
-  b:     160000      81920      swap	#      78.125M
-  c:    1173930          0    unused	#     573.208M
-  g:     320000     241920       ccd	#     156.250M
-  h:     612010     561920     vinum	#     298.833M
+  a:      81920          0    4.2BSD	#      40.000MB
+  b:     160000      81920      swap	#      78.125MB
+  c:    1173930          0    unused	#     573.208MB
+  f:     320000     241920    HAMMER	#     156.250MB
+  g:     300000     561920       ccd	#     146.484MB
+  h:     312010     861920     vinum	#     152.349MB
 .Ed
 .Pp
 Lines starting with a
@@ -698,6 +701,10 @@ For
 file systems, use type
 .Cm 4.2BSD .
 For
+.Tn HAMMER
+file systems, use type
+.Cm HAMMER .
+For
 .Xr ccd 4
 partitions, use type
 .Cm ccd .
@@ -719,8 +726,8 @@ The
 utility
 also knows about a number of other partition types,
 none of which are in current use.
-(See the definitions starting with
-.Dv FS_UNUSED
+(See
+.Dv fstypenames
 in
 .In sys/dtype.h
 for more details).
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index ea176a47c5..055fef8e46 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -37,7 +37,7 @@
  * @(#)disklabel.c	1.2 (Symmetric) 11/28/85
  * @(#)disklabel.c      8.2 (Berkeley) 1/7/94
  * $FreeBSD: src/sbin/disklabel/disklabel.c,v 1.28.2.15 2003/01/24 16:18:16 des Exp $
- * $DragonFly: src/sbin/disklabel/disklabel.c,v 1.26 2008/04/20 13:44:24 swildner Exp $
+ * $DragonFly: src/sbin/disklabel/disklabel.c,v 1.27 2008/04/23 21:59:22 thomas Exp $
  */
 
 #include <sys/param.h>
@@ -741,7 +741,7 @@ display(FILE *f, const struct disklabel32 *lp)
 			else
 				fprintf(f, "%8d", pp->p_fstype);
 
-			fprintf(f, "\t# %11.3fM", (double)pp->p_size / onemeg);
+			fprintf(f, "\t# %11.3fMB", (double)pp->p_size / onemeg);
 			fprintf(f, "\n");
 		}
 	}
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 498b1a6b9f..df55101b6a 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\" $FreeBSD: src/sbin/mount/mount.8,v 1.31.2.12 2003/02/23 21:17:42 trhodes Exp $
-.\" $DragonFly: src/sbin/mount/mount.8,v 1.7 2007/12/16 20:12:09 thomas Exp $
+.\" $DragonFly: src/sbin/mount/mount.8,v 1.8 2008/04/23 21:59:22 thomas Exp $
 .\"
 .Dd June 16, 1994
 .Dt MOUNT 8
@@ -376,6 +376,7 @@ have permission to load the module.
 .Xr mount_cd9660 8 ,
 .Xr mount_ext2fs 8 ,
 .Xr mount_fdesc 8 ,
+.Xr mount_hammer 8 ,
 .Xr mount_linprocfs 8 ,
 .Xr mount_mfs 8 ,
 .Xr mount_msdos 8 ,
diff --git a/sbin/mount_hammer/mount_hammer.8 b/sbin/mount_hammer/mount_hammer.8
index a37403b3bb..8cb1d3c7e5 100644
--- a/sbin/mount_hammer/mount_hammer.8
+++ b/sbin/mount_hammer/mount_hammer.8
@@ -30,7 +30,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $DragonFly: src/sbin/mount_hammer/mount_hammer.8,v 1.4 2007/12/14 23:16:55 swildner Exp $
+.\" $DragonFly: src/sbin/mount_hammer/mount_hammer.8,v 1.5 2008/04/23 21:59:22 thomas Exp $
 .Dd October 10, 2007
 .Dt MOUNT_HAMMER 8
 .Os
@@ -95,6 +95,7 @@ Exit status is 0 on success and 1 on error.
 .Sh SEE ALSO
 .Xr disklabel 8 ,
 .Xr fdisk 8 ,
+.Xr hammer 8 ,
 .Xr newfs_hammer 8
 .Sh HISTORY
 The
-- 
2.41.0