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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2016-06-28 16:14:04 -04:00
parent a29337d186
commit f3bd7561c5
+2 -2
View File
@@ -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;
}