From: Daan De Meyer Date: Thu, 16 Feb 2023 11:45:13 +0000 (+0100) Subject: repart: Make config_parse_copy_files() more generic X-Git-Tag: v254-rc1~1229^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de98e6a7b94522ddd60d35f94ec4be5aa323a2ea;p=thirdparty%2Fsystemd.git repart: Make config_parse_copy_files() more generic --- diff --git a/src/partition/repart.c b/src/partition/repart.c index 272bf19431d..874a8dc3ad1 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 },