diff options
Diffstat (limited to 'src/tmpfiles/tmpfiles.c')
-rw-r--r-- | src/tmpfiles/tmpfiles.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index fdabd7d2c5..3adafcae83 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -3727,9 +3727,9 @@ static int parse_argv(int argc, char *argv[]) { ARG_EXCLUDE_PREFIX, ARG_ROOT, ARG_IMAGE, + ARG_IMAGE_POLICY, ARG_REPLACE, ARG_NO_PAGER, - ARG_IMAGE_POLICY, }; static const struct option options[] = { @@ -3745,9 +3745,9 @@ static int parse_argv(int argc, char *argv[]) { { "exclude-prefix", required_argument, NULL, ARG_EXCLUDE_PREFIX }, { "root", required_argument, NULL, ARG_ROOT }, { "image", required_argument, NULL, ARG_IMAGE }, + { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, { "replace", required_argument, NULL, ARG_REPLACE }, { "no-pager", no_argument, NULL, ARG_NO_PAGER }, - { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, {} }; @@ -3825,6 +3825,12 @@ static int parse_argv(int argc, char *argv[]) { break; + case ARG_IMAGE_POLICY: + r = parse_image_policy_argument(optarg, &arg_image_policy); + if (r < 0) + return r; + break; + case ARG_REPLACE: if (!path_is_absolute(optarg) || !endswith(optarg, ".conf")) @@ -3838,17 +3844,6 @@ static int parse_argv(int argc, char *argv[]) { arg_pager_flags |= PAGER_DISABLE; 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; |