From nobody Thu Mar 17 16:32:31 2022 X-Original-To: dev-commits-src-main@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 AF5741A1D98B; Thu, 17 Mar 2022 16:32:31 +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 4KKCNb4bpdz3vCw; Thu, 17 Mar 2022 16:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647534751; 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=80tddhMS1LFvRXkNaw4T6iQZilaEm1LuGz69wdlvdbg=; b=ljlI2YZVH21HqwWMxsgNKTegZ8nE7HAvYlam4keAwPC1lLDctd46aFrKyDgY3DYZGE4u1w dyEqavUCASqHzO5kcPc4Ibpfck1j2ibuRwbiUO4ImnWL444GUPha1TYyNXje6FgT/fwZ7n MUHqpTCqQnNGDgmrFzR8BqbsZ+bXPEwJAXfpEjE6VTqczCERB0D8t2CIAYR9+JXF2Ff6JU Duez+j/u0hGvlaHO8tFMd6jpd3QsEeCWxHM241PhUzgVNGYCnraY9jBwIJOry6wKRtiVzO BRofTT7XpWxoUcifvy/KZdNZ+bvK7m+Ulh+yrWdchcKG2jR/evaAux3MlmnAwA== 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 7E0AD60E0; Thu, 17 Mar 2022 16:32:31 +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 22HGWVui018729; Thu, 17 Mar 2022 16:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HGWVm6018728; Thu, 17 Mar 2022 16:32:31 GMT (envelope-from git) Date: Thu, 17 Mar 2022 16:32:31 GMT Message-Id: <202203171632.22HGWVm6018728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: fd061175257a - main - *: Do not use the no-op -r flag for bsdlabel(8) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fd061175257a577d13852be17e3b2506ad25b987 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647534751; 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=80tddhMS1LFvRXkNaw4T6iQZilaEm1LuGz69wdlvdbg=; b=JGf8lvkm7Fb8T9rnXPjRaj74N/TAUiInrs4RLd9q9vwnJ/3DxcnzKtjMxZGMKPHb+h56Vo afoomTeyJ3WbMj5iV0TcPkuSkUXLkOTJRuUYB1qHG+wPIA8RCQxD+u9AjKC1A9RSXXcc4Y SNlS006OWIOmuhRGKxZ6NOcD/moMzYzJgVbMAq2Pvgz9R1OrmzvTwE6qZ9Mk/f08Pb5LKf s5jQ87aNhyV1AjJQRvVHcFCoVPuGv6xNRl17yJZ0vgnf4jEV9OtHoOOUSAI39iCksM+K8z tSRn+RPgOkvWpwWYtmPEBAsWl1bdiRQYjqS4GrMgxRGY72niXrCfMk7X/GHk1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647534751; a=rsa-sha256; cv=none; b=I3YMJvebmZ9xOp7NxXjZg84r7GSAuAS4v4LcymfFl6wNLehMicze1aL+8kRdoKLnyxmGtT 67ezRFt7O3qQsdCSz9bF1S9ApHh2kNS7stOFho+8PO/k+g0uayQK37JW2Z98satM1nqH/0 h9LA8KvoFyCiqrMZffaqYflY4gXE7j1VeskaQDQmBOCueBrn7xTNI6u8G9txlc9ivJ9aXk Qu4oWuhFy1JYrPhHUy2BHCbiWI3haag0PW0BzV5bXhvvkxUKSgACONfHB2fS7svG3qoqQ7 O1o6hFulsugoj9sa9wrP59bQ+nz5CsLTZtHPC+D9LBRWAuMC8GkgrGDxYV18/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=fd061175257a577d13852be17e3b2506ad25b987 commit fd061175257a577d13852be17e3b2506ad25b987 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-17 10:21:06 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-17 16:28:07 +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 --- 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