diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-04-12 22:38:01 +0900 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-04-13 11:17:28 +0200 |
| commit | 06e78680e3c36589b785f90ecda64d124905a3f7 (patch) | |
| tree | 4e30e25ea6b5d15e3156ec783cfef15744df9b27 /src/systemctl | |
| parent | 771805eb44ec42228d9d85f4d35962ff8459bb77 (diff) | |
| download | systemd-06e78680e3c36589b785f90ecda64d124905a3f7.tar.gz | |
image-policy: introduce parse_image_policy_argument() helper
Addresses
https://github.com/systemd/systemd/pull/25608/commits/84be0c710d9d562f6d2cf986cc2a8ff4c98a138b#r1060130312,
https://github.com/systemd/systemd/pull/25608/commits/84be0c710d9d562f6d2cf986cc2a8ff4c98a138b#r1067927293, and
https://github.com/systemd/systemd/pull/25608/commits/84be0c710d9d562f6d2cf986cc2a8ff4c98a138b#r1067926416.
Follow-up for 84be0c710d9d562f6d2cf986cc2a8ff4c98a138b.
Diffstat (limited to 'src/systemctl')
| -rw-r--r-- | src/systemctl/systemctl.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 21e09536a6..201d64a1f9 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -428,6 +428,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_NO_WALL, ARG_ROOT, ARG_IMAGE, + ARG_IMAGE_POLICY, ARG_NO_RELOAD, ARG_KILL_WHOM, ARG_KILL_VALUE, @@ -454,7 +455,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_NO_WARN, ARG_DROP_IN, ARG_WHEN, - ARG_IMAGE_POLICY, }; static const struct option options[] = { @@ -490,6 +490,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "no-warn", no_argument, NULL, ARG_NO_WARN }, { "root", required_argument, NULL, ARG_ROOT }, { "image", required_argument, NULL, ARG_IMAGE }, + { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, { "force", no_argument, NULL, 'f' }, { "no-reload", no_argument, NULL, ARG_NO_RELOAD }, { "kill-whom", required_argument, NULL, ARG_KILL_WHOM }, @@ -520,7 +521,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "marked", no_argument, NULL, ARG_MARKED }, { "drop-in", required_argument, NULL, ARG_DROP_IN }, { "when", required_argument, NULL, ARG_WHEN }, - { "image-policy", required_argument, NULL, ARG_IMAGE_POLICY }, {} }; @@ -706,6 +706,12 @@ static int systemctl_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 'l': arg_full = true; break; @@ -1010,18 +1016,6 @@ static int systemctl_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 '.': /* Output an error mimicking getopt, and print a hint afterwards */ log_error("%s: invalid option -- '.'", program_invocation_name); |