diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-10-11 10:01:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-11-26 18:09:01 +0100 |
| commit | e21b7229ff776891443fe3200ebf4648f3f2940b (patch) | |
| tree | 3614bdad75940841fc521e007a58e6e55fd12d49 /src/import/import-fs.c | |
| parent | machine: add support for importing containers from plain directories (diff) | |
| download | systemd-e21b7229ff776891443fe3200ebf4648f3f2940b.tar.xz systemd-e21b7229ff776891443fe3200ebf4648f3f2940b.zip | |
import: rerrange tarball/fs imports that have a single top-level directory containing the OS tree
Let's handle tarball imports nicer that have a single top-level
directory containing the OS tree: let's move everything down during
import, so that the OS tree is ready to use automatically.
Fixes: #2116
Diffstat (limited to 'src/import/import-fs.c')
| -rw-r--r-- | src/import/import-fs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/import/import-fs.c b/src/import/import-fs.c index 3836f87570..bc2e631e7b 100644 --- a/src/import/import-fs.c +++ b/src/import/import-fs.c @@ -192,6 +192,10 @@ static int import_fs(int argc, char *argv[], void *userdata) { goto finish; } + r = import_mangle_os_tree(temp_path); + if (r < 0) + goto finish; + (void) import_assign_pool_quota_and_warn(temp_path); if (arg_read_only) { |