diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:33:35 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:33:35 +0200 |
| commit | 78ed65ac8dd05041f08ba8b089e1e87445a0905f (patch) | |
| tree | e62a030ceb75b3d777c57793bec55cb7a220f7df /src/nspawn | |
| parent | dd5da693ab4579c619017b4aac2a234d4b7a3ea7 (diff) | |
| parent | 770b5ce4fc31a336a41e81381c229da725ef0cfa (diff) | |
Merge pull request #212 from poettering/gc-machine-snapshots
automatically remove old machine shapshots at boot
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index c87956bb01..080bf06077 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -350,7 +350,7 @@ static int custom_mounts_prepare(void) { if (m->read_only) continue; - r = tempfn_random(m->source, &m->work_dir); + r = tempfn_random(m->source, NULL, &m->work_dir); if (r < 0) return log_error_errno(r, "Failed to generate work directory from %s: %m", m->source); } @@ -4522,9 +4522,9 @@ int main(int argc, char *argv[]) { goto finish; } if (r > 0) - r = tempfn_random_child(arg_directory, &np); + r = tempfn_random_child(arg_directory, "machine.", &np); else - r = tempfn_random(arg_directory, &np); + r = tempfn_random(arg_directory, "machine.", &np); if (r < 0) { log_error_errno(r, "Failed to generate name for snapshot: %m"); goto finish; |