From owner-svn-src-head@freebsd.org Fri Apr 17 10:12:12 2020 Return-Path: Delivered-To: svn-src-head@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 981472B21D0; Fri, 17 Apr 2020 10:12:12 +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 493X2N3bL6z4ssN; Fri, 17 Apr 2020 10:12:12 +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 7685920AF8; Fri, 17 Apr 2020 10:12:12 +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 03HACCtn021262; Fri, 17 Apr 2020 10:12:12 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03HACCGR021260; Fri, 17 Apr 2020 10:12:12 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <202004171012.03HACCGR021260@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Fri, 17 Apr 2020 10:12:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r360040 - head/usr.sbin/jail X-SVN-Group: head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: head/usr.sbin/jail X-SVN-Commit-Revision: 360040 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2020 10:12:12 -0000 Author: eugen Date: Fri Apr 17 10:12:11 2020 New Revision: 360040 URL: https://svnweb.freebsd.org/changeset/base/360040 Log: 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 MFC after: 3 days Modified: head/usr.sbin/jail/jail.8 head/usr.sbin/jail/jail.c Modified: head/usr.sbin/jail/jail.8 ============================================================================== --- head/usr.sbin/jail/jail.8 Fri Apr 17 07:41:27 2020 (r360039) +++ head/usr.sbin/jail/jail.8 Fri Apr 17 10:12:11 2020 (r360040) @@ -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: head/usr.sbin/jail/jail.c ============================================================================== --- head/usr.sbin/jail/jail.c Fri Apr 17 07:41:27 2020 (r360039) +++ head/usr.sbin/jail/jail.c Fri Apr 17 10:12:11 2020 (r360040) @@ -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); }