diff options
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/journalctl.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index abacbb0306..5c07caa8f3 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -418,6 +418,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_SYSTEM, ARG_ROOT, ARG_IMAGE, + ARG_IMAGE_POLICY, ARG_HEADER, ARG_FACILITY, ARG_SETUP_KEYS, @@ -447,7 +448,6 @@ static int parse_argv(int argc, char *argv[]) { ARG_NO_HOSTNAME, ARG_OUTPUT_FIELDS, ARG_NAMESPACE, - ARG_IMAGE_POLICY, }; static const struct option options[] = { @@ -476,6 +476,7 @@ static int parse_argv(int argc, char *argv[]) { { "file", required_argument, NULL, ARG_FILE }, { "root", required_argument, NULL, ARG_ROOT }, { "image", required_argument, NULL, ARG_IMAGE }, + { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, { "header", no_argument, NULL, ARG_HEADER }, { "identifier", required_argument, NULL, 't' }, { "priority", required_argument, NULL, 'p' }, @@ -515,7 +516,6 @@ static int parse_argv(int argc, char *argv[]) { { "no-hostname", no_argument, NULL, ARG_NO_HOSTNAME }, { "output-fields", required_argument, NULL, ARG_OUTPUT_FIELDS }, { "namespace", required_argument, NULL, ARG_NAMESPACE }, - { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, {} }; @@ -735,6 +735,12 @@ static int parse_argv(int argc, char *argv[]) { return r; break; + case ARG_IMAGE_POLICY: + r = parse_image_policy_argument(optarg, &arg_image_policy); + if (r < 0) + return r; + break; + case 'c': arg_cursor = optarg; break; @@ -1038,17 +1044,6 @@ static int parse_argv(int argc, char *argv[]) { break; } - case ARG_IMAGE_POLICY: { - _cleanup_(image_policy_freep) ImagePolicy *p = NULL; - - r = image_policy_from_string(optarg, &p); - if (r < 0) - return log_error_errno(r, "Failed to parse image policy: %s", optarg); - - image_policy_free(arg_image_policy); - arg_image_policy = TAKE_PTR(p); - break; - } case '?': return -EINVAL; |