From 489b0f515b196fe87fda8ade3cea58126cbf5cd5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 29 Sep 2023 16:44:45 +0200 Subject: [PATCH] repart: relax rules on CopyFiles= a bit If a source dir doesn't exist, mention this, but continue. This is useful to permit generic definitions that apply to all kinds of trees, where some parts might remain unpopulated. --- src/partition/repart.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/partition/repart.c b/src/partition/repart.c index a38950c7142..51706c839a3 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -4498,6 +4498,10 @@ static int do_copy_files(Context *context, Partition *p, const char *root) { return r; sfd = chase_and_open(*source, arg_copy_source, CHASE_PREFIX_ROOT, O_CLOEXEC|O_NOCTTY, NULL); + if (sfd == -ENOENT) { + log_notice_errno(sfd, "Failed to open source file '%s%s', skipping: %m", strempty(arg_copy_source), *source); + continue; + } if (sfd < 0) return log_error_errno(sfd, "Failed to open source file '%s%s': %m", strempty(arg_copy_source), *source); -- 2.47.3