chiark / gitweb /
journal: remove all of /run/log/journal when serializing, since the machine ID might...
authorLennart Poettering <lennart@poettering.net>
Wed, 18 Jul 2012 14:23:26 +0000 (16:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 18 Jul 2012 14:23:26 +0000 (16:23 +0200)
src/journal/journald.c

index 18db31c3bc5218c89a60feff488901adc1f3732d..3e7581815b562d849ea2698a605f501d0befa990 100644 (file)
@@ -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;
 }