diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-07-18 16:23:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-07-18 16:23:26 +0200 |
| commit | 4a299a7ad547becb70e8271eaf8cdc27e8e6836a (patch) | |
| tree | 2293189af08ac094ed93b9da106b17b11ba2b530 /src/journal/journald.c | |
| parent | journal: don't complain if the syslog forwarder socket doesn't exist (diff) | |
| download | systemd-4a299a7ad547becb70e8271eaf8cdc27e8e6836a.tar.xz systemd-4a299a7ad547becb70e8271eaf8cdc27e8e6836a.zip | |
journal: remove all of /run/log/journal when serializing, since the machine ID might deviate
Diffstat (limited to 'src/journal/journald.c')
| -rw-r--r-- | src/journal/journald.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c index 18db31c3bc..3e7581815b 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -2147,11 +2147,8 @@ finish: journal_file_close(s->runtime_journal); s->runtime_journal = NULL; - if (r >= 0) { - char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; - sd_id128_to_string(machine, path + 17); - rm_rf(path, false, true, false); - } + if (r >= 0) + rm_rf("/run/log/journal", false, true, false); return r; } |