git: 386fdd971d84 - stable/12 - *: Do not use the no-op -r flag for bsdlabel(8)

The branch stable/12 has been updated by 0mp (doc, ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=386fdd971d84eff30fe93752b63a143a0642e7fe

commit 386fdd971d84eff30fe93752b63a143a0642e7fe
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2022-03-17 10:21:06 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2022-03-31 07:36:55 +0000

    *: Do not use the no-op -r flag for bsdlabel(8)
    
    The -r flag is ignored by the FreeBSD implementation of bsdlabel(8)
    (also called disklabel(8) in the past). Remove its use from examples
    and tests in the tree.
    
    This commit does not touch historical documentation under share/doc/smm
    and files under contrib/netbsd-tests.
    
    Reviewed by:    imp
    MFC after:      2 weeks
    Approved by:    imp (src)
    Fixes:          57dfbec57b6d More axe-work:
    Differential Revision:  https://reviews.freebsd.org/D34585
    
    (cherry picked from commit fd061175257a577d13852be17e3b2506ad25b987)
---
 lib/geom/multipath/gmultipath.8 | 4 ++--
 sbin/bsdlabel/disktab           | 2 +-
 sbin/ccdconfig/ccdconfig.8      | 4 ++--
 sbin/newfs/runtest00.sh         | 2 +-
 sbin/newfs/runtest01.sh         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/geom/multipath/gmultipath.8 b/lib/geom/multipath/gmultipath.8
index 53761455080d..7f0346e1c307 100644
--- a/lib/geom/multipath/gmultipath.8
+++ b/lib/geom/multipath/gmultipath.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 8, 2016
+.Dd March 17, 2022
 .Dt GMULTIPATH 8
 .Os
 .Sh NAME
@@ -338,7 +338,7 @@ GEOM provider named
 .Ar FRED .
 .Bd -literal -offset indent
 gmultipath label -v FRED /dev/da0 /dev/da2
-disklabel -Brw /dev/multipath/FRED auto
+disklabel -Bw /dev/multipath/FRED auto
 newfs /dev/multipath/FREDa
 mount /dev/multipath/FREDa /mnt....
 .Ed
diff --git a/sbin/bsdlabel/disktab b/sbin/bsdlabel/disktab
index b9bf610d597f..cb0fba033699 100644
--- a/sbin/bsdlabel/disktab
+++ b/sbin/bsdlabel/disktab
@@ -9,7 +9,7 @@
 #
 # To make a filesystem on a floppy:
 #	fdformat [-f <size>] fd<drive>[.<size>]
-#	disklabel -B -r -w fd<drive>[.<size>] fd<size>
+#	disklabel -B -w fd<drive>[.<size>] fd<size>
 #	newfs <opts> fd<drive>[.<size>]
 #
 # with <opts>:
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 778a7f921c70..e73864bc1fef 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -28,7 +28,7 @@
 .\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
 .\" $FreeBSD$
 .\"
-.Dd October 3, 2016
+.Dd March 17, 2022
 .Dt CCDCONFIG 8
 .Os
 .Sh NAME
@@ -204,7 +204,7 @@ you have A ccd disk with 10000 sectors you might create a 'd' partition
 with offset 16 and size 9984.
 .Bd -literal
 # disklabel ccd0 > /tmp/disklabel.ccd0
-# disklabel -Rr ccd0 /tmp/disklabel.ccd0
+# disklabel -R ccd0 /tmp/disklabel.ccd0
 # disklabel -e ccd0
 .Ed
 .Pp
diff --git a/sbin/newfs/runtest00.sh b/sbin/newfs/runtest00.sh
index a95dbcc83b25..ea51dee8dbda 100644
--- a/sbin/newfs/runtest00.sh
+++ b/sbin/newfs/runtest00.sh
@@ -10,7 +10,7 @@ do
 	(
 	mdconfig -d -u $MD || true
 	mdconfig -a -t malloc -s $s -u $MD
-	disklabel -r -w md$MD auto
+	disklabel -w md$MD auto
 	./newfs -R /dev/md${MD}c
 	) 1>&2
 	md5 < /dev/md${MD}c
diff --git a/sbin/newfs/runtest01.sh b/sbin/newfs/runtest01.sh
index 47128326ed24..6fe91cb86963 100644
--- a/sbin/newfs/runtest01.sh
+++ b/sbin/newfs/runtest01.sh
@@ -10,8 +10,8 @@ mdconfig -d -u $MD || true
 mdconfig -d -u $ME || true
 mdconfig -a -t malloc -s $s -u $MD
 mdconfig -a -t malloc -s $s -u $ME
-disklabel -r -w md$MD auto
-disklabel -r -w md$ME auto
+disklabel -w md$MD auto
+disklabel -w md$ME auto
 ./newfs -R /dev/md${MD}c
 ./newfs -R /dev/md${ME}c
 if cmp /dev/md${MD}c /dev/md${ME}c ; then