diff options
| author | jamie <jamie@FreeBSD.org> | 2015-02-27 02:50:01 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2015-02-27 02:50:01 +0000 |
| commit | 23006cc98220f71e10c2aa60281f449e7d57c787 (patch) | |
| tree | 2c2f32f9ba2d298de0a437aaa3cf3d80d16f0dc2 /usr.sbin | |
| parent | a5cd9b061e9e3c6fece2214d16f093bda15f44eb (diff) | |
| download | FreeBSD-src-23006cc98220f71e10c2aa60281f449e7d57c787.zip FreeBSD-src-23006cc98220f71e10c2aa60281f449e7d57c787.tar.gz | |
MFC r279081:
Allow parameters listed on the command line to override the -v option,
instead of crashing.
PR: 197701
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/jls/jls.8 | 3 | ||||
| -rw-r--r-- | usr.sbin/jls/jls.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/jls/jls.8 b/usr.sbin/jls/jls.8 index 3137654..15a80d4 100644 --- a/usr.sbin/jls/jls.8 +++ b/usr.sbin/jls/jls.8 @@ -92,7 +92,8 @@ skipping read-only and unused parameters. Implies .Fl nq . .It Fl v -Print a multiple-line summary per jail, with the following parameters: +Extend the standard display with a multiple-line summary per jail, +containing the following parameters: jail identifier (jid), hostname (host.hostname), path (path), jail name (name), jail state (dying), cpuset ID (cpuset), IP address(es) (ip4.addr and ip6.addr). diff --git a/usr.sbin/jls/jls.c b/usr.sbin/jls/jls.c index ce07100..3bcc566 100644 --- a/usr.sbin/jls/jls.c +++ b/usr.sbin/jls/jls.c @@ -166,10 +166,12 @@ main(int argc, char **argv) JP_USER); add_param("path", NULL, (size_t)0, NULL, JP_USER); } - } else + } else { + pflags &= ~PRINT_VERBOSE; while (optind < argc) add_param(argv[optind++], NULL, (size_t)0, NULL, JP_USER); + } if (pflags & PRINT_SKIP) { /* Check for parameters with jailsys parents. */ |
