From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 16 Jul 2012 22:55:02 +0000 (+0200)
Subject: journal: actually set archived files to archived state
X-Git-Tag: v187~54
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=cd96b3b86abb4a88cac2722bdfb6e5d4413f6831

journal: actually set archived files to archived state
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 180b43a9c..d8ce495d8 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -74,7 +74,8 @@ void journal_file_close(JournalFile *f) {
         assert(f);
 
         if (f->header) {
-                if (f->writable)
+                /* Mark the file offline. Don't override the archived state if it already is set */
+                if (f->writable && f->header->state == STATE_ONLINE)
                         f->header->state = STATE_OFFLINE;
 
                 munmap(f->header, PAGE_ALIGN(sizeof(Header)));