aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/jail
diff options
context:
space:
mode:
authorEugene Grosbein <eugen@FreeBSD.org>2020-04-17 10:12:11 +0000
committerEugene Grosbein <eugen@FreeBSD.org>2020-04-17 10:12:11 +0000
commit4e49fbcd3721e3fd34a6ff4808f8cca8d96e050a (patch)
tree68c2597c0e829b5ab35976ffed3c348ff8f00e7d /usr.sbin/jail
parent9edef911e8dac0870b2acff7f361a5da9cac2239 (diff)
downloadsrc-4e49fbcd3721e3fd34a6ff4808f8cca8d96e050a.tar.gz
src-4e49fbcd3721e3fd34a6ff4808f8cca8d96e050a.zip
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 <david.marec@davenulle.org> MFC after: 3 days
Notes
Notes: svn path=/head/; revision=360040
Diffstat (limited to 'usr.sbin/jail')
-rw-r--r--usr.sbin/jail/jail.87
-rw-r--r--usr.sbin/jail/jail.c5
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 774e432cc300..b813daff3b53 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -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
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 9384bddf3c4b..bedeb7f5efc5 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -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);
}