X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=da9f52813dbf2a030634d6143e81a64771291f6c;hp=0629f79f1c382fa8ebf624a2faeebee78812642d;hb=205c4d1d6a3f5343f970abf20283d69dcec359ed;hpb=461b1822321d6be0d7fd8be29bf3b4993ebd1b85;ds=sidebyside

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 0629f79f1..da9f52813 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -114,7 +114,7 @@ struct StdoutStream {
 static const char* const storage_table[] = {
         [STORAGE_AUTO] = "auto",
         [STORAGE_VOLATILE] = "volatile",
-        [STORAGE_PERMANENT] = "permanent",
+        [STORAGE_PERSISTENT] = "persistent",
         [STORAGE_NONE] = "none"
 };
 
@@ -1963,16 +1963,16 @@ static int system_journal_open(Server *s) {
         sd_id128_to_string(machine, ids);
 
         if (!s->system_journal &&
-            (s->storage == STORAGE_PERMANENT ||
+            (s->storage == STORAGE_PERSISTENT ||
              s->storage == STORAGE_AUTO)) {
 
                 /* If in auto mode: first try to create the machine
                  * path, but not the prefix.
                  *
-                 * If in permanent mode: create /var/log/journal and
+                 * If in persistent mode: create /var/log/journal and
                  * the machine path */
 
-                if (s->storage & STORAGE_PERMANENT)
+                if (s->storage & STORAGE_PERSISTENT)
                         (void) mkdir("/var/log/journal/", 0755);
 
                 fn = strappend("/var/log/journal/", ids);
@@ -2067,7 +2067,7 @@ static int server_flush_to_var(Server *s) {
         assert(s);
 
         if (s->storage != STORAGE_AUTO &&
-            s->storage != STORAGE_PERMANENT)
+            s->storage != STORAGE_PERSISTENT)
                 return 0;
 
         if (!s->runtime_journal)