diff options
| author | jamie <jamie@FreeBSD.org> | 2015-02-20 19:48:24 +0000 |
|---|---|---|
| committer | jamie <jamie@FreeBSD.org> | 2015-02-20 19:48:24 +0000 |
| commit | 88d59e6fb36ce42986854e23d27610cbccbf9b45 (patch) | |
| tree | d5badd4c4ac87b3a0e24c6a2ffb6ab2214e3ba04 /usr.sbin/jls | |
| parent | 9ad8eaa0ce372d411a28da3f29aea4c9167ee997 (diff) | |
| download | FreeBSD-src-88d59e6fb36ce42986854e23d27610cbccbf9b45.zip FreeBSD-src-88d59e6fb36ce42986854e23d27610cbccbf9b45.tar.gz | |
Allow parameters listed on the command line to override the -v option,
instead of crashing.
PR: 197701
MFC after: 1 week
Diffstat (limited to 'usr.sbin/jls')
| -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. */ |
