diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-16 12:45:13 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-16 12:45:13 +0100 |
| commit | de98e6a7b94522ddd60d35f94ec4be5aa323a2ea (patch) | |
| tree | 65bbf5cd22b21c62f63f1462ecc46d5472c8ac8f /src/partition | |
| parent | 7f3e4c948959bf6433748f18b139976064411ec3 (diff) | |
| download | systemd-de98e6a7b94522ddd60d35f94ec4be5aa323a2ea.tar.gz | |
repart: Make config_parse_copy_files() more generic
Diffstat (limited to 'src/partition')
| -rw-r--r-- | src/partition/repart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/partition/repart.c b/src/partition/repart.c index 272bf19431..874a8dc3ad 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -1333,7 +1333,7 @@ static int config_parse_copy_files( _cleanup_free_ char *source = NULL, *buffer = NULL, *resolved_source = NULL, *resolved_target = NULL; const char *p = rvalue, *target; - Partition *partition = ASSERT_PTR(data); + char ***copy_files = ASSERT_PTR(data); int r; assert(rvalue); @@ -1379,7 +1379,7 @@ static int config_parse_copy_files( if (r < 0) return 0; - r = strv_consume_pair(&partition->copy_files, TAKE_PTR(resolved_source), TAKE_PTR(resolved_target)); + r = strv_consume_pair(copy_files, TAKE_PTR(resolved_source), TAKE_PTR(resolved_target)); if (r < 0) return log_oom(); @@ -1566,7 +1566,7 @@ static int partition_read_definition(Partition *p, const char *path, const char { "Partition", "FactoryReset", config_parse_bool, 0, &p->factory_reset }, { "Partition", "CopyBlocks", config_parse_copy_blocks, 0, p }, { "Partition", "Format", config_parse_fstype, 0, &p->format }, - { "Partition", "CopyFiles", config_parse_copy_files, 0, p }, + { "Partition", "CopyFiles", config_parse_copy_files, 0, &p->copy_files }, { "Partition", "MakeDirectories", config_parse_make_dirs, 0, p }, { "Partition", "Encrypt", config_parse_encrypt, 0, &p->encrypt }, { "Partition", "Verity", config_parse_verity, 0, &p->verity }, |