Author: jamie
Date: Fri Feb 20 19:48:24 2015
New Revision: 279081
URL: https://svnweb.freebsd.org/changeset/base/279081
Log:
Allow parameters listed on the command line to override the -v option,
instead of crashing.
PR: 197701
MFC after: 1 week
Modified:
head/usr.sbin/jls/jls.8
head/usr.sbin/jls/jls.c
Modified: head/usr.sbin/jls/jls.8
==============================================================================
--- head/usr.sbin/jls/jls.8 Fri Feb 20 19:44:02 2015 (r279080)
+++ head/usr.sbin/jls/jls.8 Fri Feb 20 19:48:24 2015 (r279081)
@@ -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).
Modified: head/usr.sbin/jls/jls.c
==============================================================================
--- head/usr.sbin/jls/jls.c Fri Feb 20 19:44:02 2015 (r279080)
+++ head/usr.sbin/jls/jls.c Fri Feb 20 19:48:24 2015 (r279081)
@@ -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. */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
