[systemd-commits] 2 commits - src/core src/shared

[Lennart Poettering]

 src/core/manager.c |    4 ++--
 src/shared/list.h  |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit cdda4aa8d20c2679cc937d40e793abe7806f17cb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 28 14:03:31 2015 +0100

    list: properly skip over first item in LIST_FOREACH_OTHERS

diff --git a/src/shared/list.h b/src/shared/list.h
index 7ed6318..2939216 100644
--- a/src/shared/list.h
+++ b/src/shared/list.h
@@ -144,6 +144,8 @@
                 (i) = (p);                                              \
                 while ((i) && (i)->name##_prev)                         \
                         (i) = (i)->name##_prev;                         \
+                if ((i) == (p))                                         \
+                        (i) = (p)->name##_next;                         \
              });                                                        \
              (i);                                                       \
              (i) = (i)->name##_next == (p) ? (p)->name##_next : (i)->name##_next)

commit d1f6b1b455cd15dec3948267d5fff570d5597309
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 28 14:03:24 2015 +0100

    manager: fix minor typo

diff --git a/src/core/manager.c b/src/core/manager.c
index d86fdd2..0b24cdd 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1725,8 +1725,8 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
                 case SIGINT:
                         if (m->running_as == SYSTEMD_SYSTEM) {
 
-                                /* If the user presses C-A-D too more
-                                 * than 7 times within 2s, we reboot
+                                /* If the user presses C-A-D more than
+                                 * 7 times within 2s, we reboot
                                  * immediately. */
 
                                 if (ratelimit_test(&m->ctrl_alt_del_ratelimit))