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:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user