summaryrefslogtreecommitdiff
path: root/src/journal/journald.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-07-10 19:39:27 +0200
committerLennart Poettering <lennart@poettering.net>2012-07-10 19:39:27 +0200
commit205c4d1d6a3f5343f970abf20283d69dcec359ed (patch)
tree3017a29e6d836d49bfe1c487efc569ff29773e9a /src/journal/journald.c
parent805623aaa43e78d4dcfb74a7cea689a23449eeed (diff)
journald: use "persistent", not "permanent" as storage option
"permanent" is simply the wrong term and we use "persistant" in most other contexts to correct this.
Diffstat (limited to 'src/journal/journald.c')
-rw-r--r--src/journal/journald.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 0629f79f1c..da9f52813d 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)