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-tar.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-tar.c')
| -rw-r--r-- | src/import/pull-tar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c index 375ee778e2..91833d6174 100644 --- a/src/import/pull-tar.c +++ b/src/import/pull-tar.c @@ -256,7 +256,7 @@ static int tar_pull_make_local_copy(TarPull *i) { local_settings = strjoina(i->image_root, "/", i->local, ".nspawn"); - r = copy_file_atomic(i->settings_path, local_settings, 0664, i->force_local, 0); + r = copy_file_atomic(i->settings_path, local_settings, 0664, 0, COPY_REFLINK | (i->force_local ? COPY_REPLACE : 0)); if (r == -EEXIST) log_warning_errno(r, "Settings file %s already exists, not replacing.", local_settings); else if (r == -ENOENT) |