diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2022-03-17 10:21:06 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2022-03-17 16:28:07 +0000 |
| commit | fd061175257a577d13852be17e3b2506ad25b987 (patch) | |
| tree | 0fc474ca807dbda29d93d06b6556314df96c769b /sbin | |
| parent | f37dc50d9f082cb9ce427847aa7227b6d4d44465 (diff) | |
| download | src-fd061175257a577d13852be17e3b2506ad25b987.tar.gz src-fd061175257a577d13852be17e3b2506ad25b987.zip | |
*: 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
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/bsdlabel/disktab | 2 | ||||
| -rw-r--r-- | sbin/ccdconfig/ccdconfig.8 | 4 | ||||
| -rw-r--r-- | sbin/newfs/runtest00.sh | 2 | ||||
| -rw-r--r-- | sbin/newfs/runtest01.sh | 4 |
4 files changed, 6 insertions, 6 deletions
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 |