diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-22 23:15:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 23:15:07 -0500 |
| commit | c5c755e1bc76165a635e7036b0f7888395d82ae7 (patch) | |
| tree | 0cb11269133a7e215c0ef21833975ce5702885d3 /src/import/pull-common.c | |
| parent | 1a1b13c9573b8cd30a4ab8dca2ec7961e460f083 (diff) | |
| parent | acbbf69b718260755a5dff60dd68ba239ac0d61b (diff) | |
Merge pull request #4693 from poettering/nspawn-ephemeral
nspawn: support ephemeral boots from images
Diffstat (limited to 'src/import/pull-common.c')
| -rw-r--r-- | src/import/pull-common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/import/pull-common.c b/src/import/pull-common.c index 2ae2a4174c..5ddc0c56f4 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -144,12 +144,12 @@ int pull_make_local_copy(const char *final, const char *image_root, const char * if (force_local) (void) rm_rf(p, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME); - r = btrfs_subvol_snapshot(final, p, BTRFS_SNAPSHOT_QUOTA); - if (r == -ENOTTY) { - r = copy_tree(final, p, false); - if (r < 0) - return log_error_errno(r, "Failed to copy image: %m"); - } else if (r < 0) + r = btrfs_subvol_snapshot(final, p, + BTRFS_SNAPSHOT_QUOTA| + BTRFS_SNAPSHOT_FALLBACK_COPY| + BTRFS_SNAPSHOT_FALLBACK_DIRECTORY| + BTRFS_SNAPSHOT_RECURSIVE); + if (r < 0) return log_error_errno(r, "Failed to create local image: %m"); log_info("Created new local image '%s'.", local); |