[systemd-commits] 3 commits - TODO src/journal src/sleep

[Lennart Poettering]

 TODO                     |    6 ++++++
 src/journal/journalctl.c |    8 ++++++--
 src/sleep/sleep.c        |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit a5ccdb9884a730553bce96b6d041b28da30d668f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 03:58:20 2014 +0100

    sleep: drop redundant MESSAGE= prefix

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 415893b..56b963a 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -121,7 +121,7 @@ static int execute(char **modes, char **states) {
 
         log_struct(LOG_INFO,
                    LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
-                   LOG_MESSAGE("MESSAGE=System resumed."),
+                   LOG_MESSAGE("System resumed."),
                    "SLEEP=%s", arg_verb,
                    NULL);
 

commit bf27dcb613a3924b7f4ec74c2de29ace79d62b01
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Dec 9 03:58:10 2014 +0100

    update TODO

diff --git a/TODO b/TODO
index 91b2ebb..2de6bd4 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,8 @@ Preparations for 218:
 
 * Backport: git notes
 
+* cgroup delegation issues
+
 Bugfixes:
 
 * Should systemctl status \* work on all unit types, not just .service?
@@ -43,6 +45,10 @@ External:
 
 Features:
 
+* journald: broken file systems are real (btrfs), we need to handle
+  SIGBUS in some way if we cannot write or read from the disk.
+  https://bugzilla.redhat.com/show_bug.cgi?id=1151848
+
 * "systemctl preset-all" should probably order the unit files it
   operates on lexicographically before starting to work, in order to
   ensure deterministic behaviour if two unit files conflict (like DMs

commit 8ee8e53648bf45854d92b60e1e70c17a0cec3c3d
Author: Wesley Dawson <whd at mozilla.com>
Date:   Sun Nov 30 23:27:00 2014 -0800

    journalctl: respect --after-cursor semantics with --follow in all cases
    
    In the case where no entries have been added to the journal after the specified
    cursor, set need_seek before the main loop to prevent display of the entry at
    said cursor.

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5c2a56d..3cec9a0 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1934,9 +1934,13 @@ int main(int argc, char *argv[]) {
                 else
                         r = sd_journal_previous_skip(j, 1 + !!arg_after_cursor);
 
-                if (arg_after_cursor && r < 2 && !arg_follow)
+                if (arg_after_cursor && r < 2) {
                         /* We couldn't find the next entry after the cursor. */
-                        arg_lines = 0;
+                        if (arg_follow)
+                                need_seek = true;
+                        else
+                                arg_lines = 0;
+                }
 
         } else if (arg_since_set && !arg_reverse) {
                 r = sd_journal_seek_realtime_usec(j, arg_since);