chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: use "persistent", not "permanent" as storage option
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index 8d1b10d270aacbacfb5f2bd0ff053d329acd5c35..da9f52813dbf2a030634d6143e81a64771291f6c 100644
(file)
--- 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",
static const char* const storage_table[] = {
[STORAGE_AUTO] = "auto",
[STORAGE_VOLATILE] = "volatile",
- [STORAGE_PER
MANENT] = "perman
ent",
+ [STORAGE_PER
SISTENT] = "persist
ent",
[STORAGE_NONE] = "none"
};
[STORAGE_NONE] = "none"
};
@@
-1963,16
+1963,16
@@
static int system_journal_open(Server *s) {
sd_id128_to_string(machine, ids);
if (!s->system_journal &&
sd_id128_to_string(machine, ids);
if (!s->system_journal &&
- (s->storage == STORAGE_PER
MAN
ENT ||
+ (s->storage == STORAGE_PER
SIST
ENT ||
s->storage == STORAGE_AUTO)) {
/* If in auto mode: first try to create the machine
* path, but not the prefix.
*
s->storage == STORAGE_AUTO)) {
/* If in auto mode: first try to create the machine
* path, but not the prefix.
*
- * If in per
man
ent mode: create /var/log/journal and
+ * If in per
sist
ent mode: create /var/log/journal and
* the machine path */
* the machine path */
- if (s->storage & STORAGE_PER
MAN
ENT)
+ if (s->storage & STORAGE_PER
SIST
ENT)
(void) mkdir("/var/log/journal/", 0755);
fn = strappend("/var/log/journal/", ids);
(void) mkdir("/var/log/journal/", 0755);
fn = strappend("/var/log/journal/", ids);
@@
-2058,7
+2058,6
@@
static int system_journal_open(Server *s) {
}
static int server_flush_to_var(Server *s) {
}
static int server_flush_to_var(Server *s) {
- char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
Object *o = NULL;
int r;
sd_id128_t machine;
Object *o = NULL;
int r;
sd_id128_t machine;
@@
-2068,7
+2067,7
@@
static int server_flush_to_var(Server *s) {
assert(s);
if (s->storage != STORAGE_AUTO &&
assert(s);
if (s->storage != STORAGE_AUTO &&
- s->storage != STORAGE_PER
MAN
ENT)
+ s->storage != STORAGE_PER
SIST
ENT)
return 0;
if (!s->runtime_journal)
return 0;
if (!s->runtime_journal)
@@
-2135,6
+2134,7
@@
finish:
s->runtime_journal = NULL;
if (r >= 0) {
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);
}
sd_id128_to_string(machine, path + 17);
rm_rf(path, false, true, false);
}