diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-02-17 13:51:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-17 13:51:58 +0100 |
| commit | e4363cd8ae9e0db02aeb4fa45cc785925e78c80e (patch) | |
| tree | c1072ba3130a025250dc06df8b2ca2e726838a57 /src/import/pull-raw.c | |
| parent | ea2aa0343f91f3cd2842129e94dbf05525732e7f (diff) | |
| parent | aa10469e17bd145c5d5c8c9b93438a0ee74d1ecf (diff) | |
Merge pull request #5333 from poettering/machined-copy-files-userns
machined userns fixes
Diffstat (limited to 'src/import/pull-raw.c')
| -rw-r--r-- | src/import/pull-raw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c index ef7fb6ac42..60a769e944 100644 --- a/src/import/pull-raw.c +++ b/src/import/pull-raw.c @@ -315,7 +315,7 @@ static int raw_pull_copy_auxiliary_file( local = strjoina(i->image_root, "/", i->local, suffix); - r = copy_file_atomic(*path, local, 0644, i->force_local, 0); + r = copy_file_atomic(*path, local, 0644, 0, COPY_REFLINK | (i->force_local ? COPY_REPLACE : 0)); if (r == -EEXIST) log_warning_errno(r, "File %s already exists, not replacing.", local); else if (r == -ENOENT) @@ -378,7 +378,7 @@ static int raw_pull_make_local_copy(RawPull *i) { if (r < 0) log_warning_errno(r, "Failed to set file attributes on %s: %m", tp); - r = copy_bytes(i->raw_job->disk_fd, dfd, (uint64_t) -1, true); + r = copy_bytes(i->raw_job->disk_fd, dfd, (uint64_t) -1, COPY_REFLINK); if (r < 0) { unlink(tp); return log_error_errno(r, "Failed to make writable copy of image: %m"); |