diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-28 15:27:07 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-28 16:14:04 -0400 |
| commit | f3bd7561c54dea82b128d06f6b269a4951ae2855 (patch) | |
| tree | ee4d7b4825381ceea1bb304d87e2c377e9636140 /src/journal | |
| parent | a29337d18678c5ebc5c1fd17b7fa4016551c5646 (diff) | |
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.
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journalctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 8e4897831b..ac55e68b90 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; } |