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/gpt-auto-generator | |
| 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/gpt-auto-generator')
| -rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 09c63a31b2..33c215bcb5 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -888,20 +888,8 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat arg_root_rw = true; else if (proc_cmdline_key_streq(key, "ro") && !value) arg_root_rw = false; - else if (proc_cmdline_key_streq(key, "systemd.image_policy")) { - _cleanup_(image_policy_freep) ImagePolicy *p = NULL; - - if (proc_cmdline_value_missing(key, value)) - return 0; - - r = image_policy_from_string(value, &p); - if (r < 0) - return log_error_errno(r, "Failed to parse image policy: %s", value); - - image_policy_free(arg_image_policy); - arg_image_policy = TAKE_PTR(p); - return 0; - } + else if (proc_cmdline_key_streq(key, "systemd.image_policy")) + return parse_image_policy_argument(optarg, &arg_image_policy); return 0; } |