mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-27 18:55:09 +03:00
Merge pull request #9830 from yuwata/journalctl-help
journal: do not hide options in help message
This commit is contained in:
commit
eb84f3596b
@ -46,9 +46,9 @@ _journalctl() {
|
||||
--flush --rotate --sync --no-hostname -N --fields'
|
||||
[ARG]='-b --boot -D --directory --file -F --field -t --identifier
|
||||
-M --machine -o --output -u --unit --user-unit -p --priority
|
||||
--root'
|
||||
--root --case-sensitive'
|
||||
[ARGUNKNOWN]='-c --cursor --interval -n --lines -S --since -U --until
|
||||
--after-cursor --verify-key
|
||||
--after-cursor --verify-key -g --grep
|
||||
--vacuum-size --vacuum-time --vacuum-files --output-fields'
|
||||
)
|
||||
|
||||
@ -86,6 +86,9 @@ _journalctl() {
|
||||
--identifier|-t)
|
||||
comps=$(journalctl -F 'SYSLOG_IDENTIFIER' 2>/dev/null)
|
||||
;;
|
||||
--case-sensitive)
|
||||
comps='yes no'
|
||||
;;
|
||||
*)
|
||||
return 0
|
||||
;;
|
||||
|
@ -342,11 +342,9 @@ static void help(void) {
|
||||
" -D --directory=PATH Show journal files from directory\n"
|
||||
" --file=PATH Show journal file\n"
|
||||
" --root=ROOT Operate on files below a root directory\n"
|
||||
#if HAVE_GCRYPT
|
||||
" --interval=TIME Time interval for changing the FSS sealing key\n"
|
||||
" --verify-key=KEY Specify FSS verification key\n"
|
||||
" --force Override of the FSS key pair with --setup-keys\n"
|
||||
#endif
|
||||
"\nCommands:\n"
|
||||
" -h --help Show this help text\n"
|
||||
" --version Show package version\n"
|
||||
@ -365,9 +363,7 @@ static void help(void) {
|
||||
" --dump-catalog Show entries in the message catalog\n"
|
||||
" --update-catalog Update the message catalog database\n"
|
||||
" --new-id128 Generate a new 128-bit ID\n"
|
||||
#if HAVE_GCRYPT
|
||||
" --setup-keys Generate a new FSS key pair\n"
|
||||
#endif
|
||||
, program_invocation_short_name);
|
||||
}
|
||||
|
||||
@ -741,7 +737,7 @@ static int parse_argv(int argc, char *argv[]) {
|
||||
case ARG_VERIFY_KEY:
|
||||
case ARG_INTERVAL:
|
||||
case ARG_FORCE:
|
||||
log_error("Forward-secure sealing not available.");
|
||||
log_error("Compiled without forward-secure sealing support.");
|
||||
return -EOPNOTSUPP;
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user