MFC r279081:

Allow parameters listed on the command line to override the -v option,
  instead of crashing.

PR:		197701
This commit is contained in:
jamie 2015-02-27 02:50:01 +00:00
parent a5cd9b061e
commit 23006cc982
2 changed files with 5 additions and 2 deletions

View File

@ -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).

View File

@ -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. */