Date: Sun, 17 Jan 2021 09:18:34 GMT From: Robert Wing <rew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 3d3c424eb6e3 - stable/12 - bectl(8): sync man page and help text Message-ID: <202101170918.10H9IYYL062295@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3c424eb6e3909f2f7cd318b9a8a1bbb0783705 commit 3d3c424eb6e3909f2f7cd318b9a8a1bbb0783705 Author: Robert Wing <rew@FreeBSD.org> AuthorDate: 2021-01-06 19:38:25 +0000 Commit: Robert Wing <rew@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101170918.10H9IYYL062295>