From owner-svn-src-all@freebsd.org Mon Apr 20 08:12:41 2020 Return-Path: Delivered-To: svn-src-all@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 8594D2BA911; Mon, 20 Apr 2020 08:12:41 +0000 (UTC) (envelope-from eugen@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 495KF52zfmz3Nhn; Mon, 20 Apr 2020 08:12:41 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6178DC649; Mon, 20 Apr 2020 08:12:41 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03K8CfQG075960; Mon, 20 Apr 2020 08:12:41 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03K8CeYH075958; Mon, 20 Apr 2020 08:12:40 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202004200812.03K8CeYH075958@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Mon, 20 Apr 2020 08:12:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360111 - stable/12/usr.sbin/jail X-SVN-Group: stable-12 X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: stable/12/usr.sbin/jail X-SVN-Commit-Revision: 360111 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Apr 2020 08:12:41 -0000 Author: eugen Date: Mon Apr 20 08:12:40 2020 New Revision: 360111 URL: https://svnweb.freebsd.org/changeset/base/360111 Log: MFC r360040: jail(8): improve manual and usage information with more clear description for "jail -e" mode to show that it does not take additional jail name argument. Reported by: David Marec Modified: stable/12/usr.sbin/jail/jail.8 stable/12/usr.sbin/jail/jail.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/jail/jail.8 ============================================================================== --- stable/12/usr.sbin/jail/jail.8 Mon Apr 20 01:26:18 2020 (r360110) +++ stable/12/usr.sbin/jail/jail.8 Mon Apr 20 08:12:40 2020 (r360111) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 6, 2019 +.Dd April 17, 2020 .Dt JAIL 8 .Os .Sh NAME @@ -49,7 +49,6 @@ .Nm .Op Fl qv .Op Fl f Ar conf_file -.Op Fl e Ar separator .Op Fl rR .Op Cm * | Ar jail ... .Nm @@ -60,6 +59,10 @@ .Op Fl n Ar jailname .Op Fl s Ar securelevel .Op Ar path hostname [ Ar ip Ns [ Ns Ar ,... Ns ]] Ar command ... +.Nm +.Op Fl f Ar conf_file +.Fl e +.Ar separator .Sh DESCRIPTION The .Nm Modified: stable/12/usr.sbin/jail/jail.c ============================================================================== --- stable/12/usr.sbin/jail/jail.c Mon Apr 20 01:26:18 2020 (r360110) +++ stable/12/usr.sbin/jail/jail.c Mon Apr 20 08:12:40 2020 (r360111) @@ -1040,10 +1040,11 @@ usage(void) (void)fprintf(stderr, "usage: jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n" " -[cmr] param=value ... [command=command ...]\n" - " jail [-dqv] [-f file] [-e separator] -[cmr] [jail]\n" + " jail [-dqv] [-f file] -[cmr] [jail]\n" " jail [-qv] [-f file] -[rR] ['*' | jail ...]\n" " jail [-dhilqv] [-J jid_file] [-u username] [-U username]\n" " [-n jailname] [-s securelevel]\n" - " path hostname [ip[,...]] command ...\n"); + " path hostname [ip[,...]] command ...\n" + " jail [-f file] -e separator\n"); exit(1); }