From owner-dev-commits-src-branches@freebsd.org Sun Jan 17 09:18:34 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFED14E1D5C; Sun, 17 Jan 2021 09:18:34 +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 4DJTqZ5z63z4dQ2; Sun, 17 Jan 2021 09:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B53E61F105; Sun, 17 Jan 2021 09:18:34 +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 10H9IYr4062296; Sun, 17 Jan 2021 09:18:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10H9IYYL062295; Sun, 17 Jan 2021 09:18:34 GMT (envelope-from git) Date: Sun, 17 Jan 2021 09:18:34 GMT Message-Id: <202101170918.10H9IYYL062295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Wing Subject: git: 3d3c424eb6e3 - stable/12 - bectl(8): sync man page and help text MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3d3c424eb6e3909f2f7cd318b9a8a1bbb0783705 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2021 09:18:34 -0000 The branch stable/12 has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3c424eb6e3909f2f7cd318b9a8a1bbb0783705 commit 3d3c424eb6e3909f2f7cd318b9a8a1bbb0783705 Author: Robert Wing AuthorDate: 2021-01-06 19:38:25 +0000 Commit: Robert Wing CommitDate: 2021-01-17 09:12:42 +0000 bectl(8): sync man page and help text Sync man page with behavior of bectl(8). Sync help text with man page. PR: 246697 Reported by: olgeni Submitted by: olgeni (with changes) Reviewed by: kevans, olgeni Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D27482 (cherry picked from commit b1ea63e2e3c92d1346af067f5cf609e3e062f8b9) --- sbin/bectl/bectl.8 | 11 +++++------ sbin/bectl/bectl.c | 9 ++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index e45bc6b99551..809a0d2f51a8 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -17,7 +17,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 17, 2020 +.Dd January 6, 2021 .Dt BECTL 8 .Os .Sh NAME @@ -71,8 +71,7 @@ .Ar newBeName .Nm .Brq Cm ujail | unjail -.Brq Ar jailId | jailName -.Ar beName +.Brq Ar jailId | jailName | beName .Nm .Brq Cm umount | unmount .Op Fl f @@ -249,7 +248,7 @@ generated by All default parameters may be overwritten. .It Xo .Cm list -.Op Fl DHas +.Op Fl aDHs .Oo Bro Fl c Ar property | Fl C Ar property Brc Oc .Xc .Pp @@ -312,8 +311,8 @@ Rename the given to the given .Ar newBeName . The boot environment will not be unmounted in order for this rename to occur. -.It Cm ujail Bro Ar jailId | jailName Brc Ar beName -.It Cm unjail Bro Ar jailId | jailName Brc Ar beName +.It Cm ujail Brq Ar jailId | jailName | beName +.It Cm unjail Brq Ar jailId | jailName | beName Destroy the jail created from the given boot environment. .It Xo .Cm umount diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index 71108b9c0855..768d1cd89ac2 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -78,13 +78,12 @@ usage(bool explicit) "\tbectl destroy [-F] {beName | beName@snapshot}\n" "\tbectl export sourceBe\n" "\tbectl import targetBe\n" - "\tbectl jail {-b | -U} [{-o key=value | -u key}]... " - "{jailID | jailName}\n" - "\t bootenv [utility [argument ...]]\n" - "\tbectl list [-DHas] [{-c property | -C property}]\n" + "\tbectl jail [-bU] [{-o key=value | -u key}]... beName\n" + "\t [utility [argument ...]]\n" + "\tbectl list [-aDHs] [{-c property | -C property}]\n" "\tbectl mount beName [mountpoint]\n" "\tbectl rename origBeName newBeName\n" - "\tbectl {ujail | unjail} {jailID | jailName} bootenv\n" + "\tbectl {ujail | unjail} {jailID | jailName | beName}\n" "\tbectl {umount | unmount} [-f] beName\n"); return (explicit ? 0 : EX_USAGE);