From 2115226a8178ceee3a9fb48a1f1c905e2c5c5fb3 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 16 Jul 2014 13:46:30 +0000
Subject: [PATCH] Yes /etc/disklabels/ is a good practice for placing labels of
 disks in case of catastropy.  But it is so poorly documented that any admin
 is more likely to store the labels elsewhere, so let's stop bothering with
 providing the directory.  Discussed a bit, no objections.

---
 etc/mtree/4.4BSD.dist      | 4 +---
 sbin/disklabel/disklabel.8 | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index 0577837dde8..6eb47c8d79c 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.257 2014/07/16 10:35:48 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.258 2014/07/16 13:46:30 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -16,8 +16,6 @@ etc
     ..
     authpf			uname=root mode=0755
     ..
-    disklabels
-    ..
     examples
     ..
     firmware
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index e68b59b970e..24db88e1c8d 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.110 2014/05/07 18:55:52 krw Exp $
+.\"	$OpenBSD: disklabel.8,v 1.111 2014/07/16 13:46:30 deraadt Exp $
 .\"	$NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: May 7 2014 $
+.Dd $Mdocdate: July 16 2014 $
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -592,8 +592,6 @@ swap		 5% of disk.   1M \(en 2x max physical memory
 .Ed
 .Sh FILES
 .Bl -tag -width Pa -compact
-.It Pa /etc/disklabels
-Directory for backup labels.
 .It Pa /etc/disktab
 Disk description file.
 .It Pa /usr/mdec/ Ns Em xx Ns boot
-- 
2.20.1