[systemd-commits] 2 commits - TODO src/journal

[Lennart Poettering]

 TODO                   |    4 ++++
 src/journal/journald.c |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit bbd16ba5739c9b3c19e32a5a2f9e4e93d0ddb0c0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 18 13:11:28 2012 +0200

    update TODO

diff --git a/TODO b/TODO
index 172c35b..27fc5a3 100644
--- a/TODO
+++ b/TODO
@@ -34,6 +34,10 @@ Bugfixes:
 
 Features:
 
+* nspawn: if /var/log/journal/<container machine id> exists in both
+  the container and the host mount one to the other so that the
+  containers logs are stored and visible on the host.
+
 * syscall filter: add knowledge about compat syscalls
 
 * logind: wakelock/opportunistic suspend support

commit 32fca2d5b746b86bbbbd4f1b57064076cfc2ae4b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 18 13:10:09 2012 +0200

    journald: fix bad memory access
    
    After vacuuming we need to retrieve the journal file object again, since
    it might have changed.

diff --git a/src/journal/journald.c b/src/journal/journald.c
index d8cfa66..c29d75c 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -513,6 +513,10 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned
                 server_vacuum(s);
                 vacuumed = true;
 
+                f = find_journal(s, uid);
+                if (!f)
+                        return;
+
                 log_info("Retrying write.");
         }
 }