From nobody Thu Mar 31 07:37:48 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9EB311A503DF; Thu, 31 Mar 2022 07:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTZs96vb9z4Z7B; Thu, 31 Mar 2022 07:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648712270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7RJk8M/+wpTDAO834mpCQmojdL6hU1c3SIMqHXa7QY=; b=Fx31EwZI6q2NasVe/M9U6JyMeo2efgdvdNtlOE9WS7WsmlQrM2jXCn9bY/DskIzPfSRPas ORXWPdUDqt0+v9f3KnUHipdNDC49eTJJLu1IqNQ90Ao/tQhZUgjP1RehfC+7slVQBceTUk 0LGvNjwxyopTwfGGtj65FgzX01uVBDQkMS7GppJ3HQgNv7o9tLnMd9DNkPIPrEsarSKX/R bVx/yGjVGqLzTa0UdtnZ0OiG8Z/0njEqQOE7N/ezH2pltODQsu5UJDcAxkcihrpLZMl9XY 3ENDxb563HV1e6zqLN20j1hf1Im7NsNmNlj2rWX/axWCOYCVZs6VZ6AJCH1TTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E115423980; Thu, 31 Mar 2022 07:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22V7bmpH007643; Thu, 31 Mar 2022 07:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22V7bm8H007642; Thu, 31 Mar 2022 07:37:48 GMT (envelope-from git) Date: Thu, 31 Mar 2022 07:37:48 GMT Message-Id: <202203310737.22V7bm8H007642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 386fdd971d84 - stable/12 - *: Do not use the no-op -r flag for bsdlabel(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 386fdd971d84eff30fe93752b63a143a0642e7fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648712270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C7RJk8M/+wpTDAO834mpCQmojdL6hU1c3SIMqHXa7QY=; b=Djxh2XgMtd9AnewMEHpLDcZs3Ks+zLmYoWYamfJvZPTeOCS8s6CTMNlztMQLrlCVJ0oRWv Z2BWHzIkGZl+Advl0jb9iBFJAwf1LMLBJwJhqSczfGboQt+TO2bPOPwLbrVjiWGuz2E1Jv JjrVTC1we0ttQgSCmSqLscOkLghBkUONAcrFlqEAo9XNJ9Q34+UzFC8xIqJQ0r1ynPS/F1 gRpgNwSaDzK7TjLA5RaKJm64laATVKsNpfxGWOGyhtN2yi1xbmx2orOmTNtUtcsG4E/uXY xS0WQfGKpL8l5hZ7tidS39LXrQQ70/Szg4G3F1e6UPZfAAIFrHPWY9TdzRVGpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648712270; a=rsa-sha256; cv=none; b=F3FMGJzoTDaeXvGADYX9IZ8Ewzh2kXsRrfyyHlqIIdTQXtIHn3an1aDgARpVbGml65zOQt MprVNxQIknz6e7l19OtV79LJy7Zs+/fshe1Ks+cMlTTrO//bxa0vEwu4n+HJgYA4iq9+jI +9nSDsOHlwAwSIdOP1aoAPmEdHhTNZVGw/KMKAITmNV6OzrxvMwCQ9BsK5up5S9OgCQr6Q 4OWdbbvmr7VkMBLg+EtY/o/rAwKZvfArgTjNFnNOquj6Uqgc9eDzf+D+28Cg3CiPKi4Sqk vQlukJz5tXrHu5j3LytybPn4seUSCMiooqffZOrCKqNH3lZG7dMLnlydQhn/Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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 ] fd[.] -# disklabel -B -r -w fd[.] fd +# disklabel -B -w fd[.] fd # newfs fd[.] # # with : 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