From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 28 Jun 2016 19:27:07 +0000 (-0400)
Subject: journalctl: allow --file/--directory with --boot or --list-boots
X-Git-Tag: v231~102^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3bd7561c54dea82b128d06f6b269a4951ae2855;p=thirdparty%2Fsystemd.git

journalctl: allow --file/--directory with --boot or --list-boots

It works mostly fine, and can be quite useful to examine data from another
system.

OTOH, a single boot id doesn't make sense with --merge, so mixing with --merge
is still not allowed.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 8e4897831b3..ac55e68b90c 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -868,8 +868,8 @@ static int parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
-        if ((arg_boot || arg_action == ACTION_LIST_BOOTS) && (arg_file || arg_directory || arg_merge)) {
-                log_error("Using --boot or --list-boots with --file, --directory or --merge is not supported.");
+        if ((arg_boot || arg_action == ACTION_LIST_BOOTS) && arg_merge) {
+                log_error("Using --boot or --list-boots with --merge is not supported.");
                 return -EINVAL;
         }