From: Yu Watanabe Date: Wed, 8 Aug 2018 06:29:07 +0000 (+0900) Subject: journal: do not hide options in help message X-Git-Tag: v240~849^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9830%2Fhead;p=thirdparty%2Fsystemd.git journal: do not hide options in help message Even if built without gcrypt, show the relevant options in help message. Otherwise, the help message diverges from the man page or suggestions by the shell completion. --- diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 56b1be530d6..799510504b0 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -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