From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 18 Jul 2012 14:23:26 +0000 (+0200)
Subject: journal: remove all of /run/log/journal when serializing, since the machine ID might... 
X-Git-Tag: v187~22
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4a299a7ad547becb70e8271eaf8cdc27e8e6836a;hp=4ca86bbc25540acc322679b98c4f18a540c100ee

journal: remove all of /run/log/journal when serializing, since the machine ID might deviate
---

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 18db31c3b..3e7581815 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;
 }