[systemd-commits] 2 commits - src/socket.c src/unit.c units/systemd-update-utmp-runlevel.service.in units/systemd-update-utmp-shutdown.service.in

Lennart Poettering lennart at kemper.freedesktop.org
Mon Sep 13 16:31:47 PDT 2010


 src/socket.c                                  |    2 +-
 src/unit.c                                    |    1 +
 units/systemd-update-utmp-runlevel.service.in |    3 ++-
 units/systemd-update-utmp-shutdown.service.in |    3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 83a95334c9e1841595f5eef20938dbd0e1ad7f76
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 01:31:41 2010 +0200

    socket: fix output of TCP congestion options

diff --git a/src/socket.c b/src/socket.c
index 34068b9..da85ca7 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -385,7 +385,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                 prefix, s->directory_mode,
                 prefix, yes_no(s->keep_alive),
                 prefix, yes_no(s->free_bind),
-                prefix, s->tcp_congestion);
+                prefix, strna(s->tcp_congestion));
 
         if (s->control_pid > 0)
                 fprintf(f,
diff --git a/src/unit.c b/src/unit.c
index d28a0a8..ca15c25 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -440,6 +440,7 @@ static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) {
         assert(other);
         assert(d < _UNIT_DEPENDENCY_MAX);
 
+        /* Fix backwards pointers */
         SET_FOREACH(back, other->meta.dependencies[d], i) {
                 UnitDependency k;
 
commit 3c4e3e1a9b5d4ffc13f61cc6510d67deb702fb6b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 01:07:06 2010 +0200

    units: make sure the file system is writable before we write utmp data

diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 724e4a4..0cbde37 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -8,8 +8,9 @@
 [Unit]
 Description=Notify Audit System and Update UTMP about System Runlevel Changes
 DefaultDependencies=no
+Wants=local-fs.target sysinit.target
+After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
 Before=poweroff.service reboot.service halt.service killall.service
-After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target auditd.service
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index 2042b71..0b4fe92 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -8,8 +8,9 @@
 [Unit]
 Description=Notify Audit System and Update UTMP about System Shutdown
 DefaultDependencies=no
+Wants=local-fs.target sysinit.target
+After=local-fs.target sysinit.target auditd.service systemd-update-utmp-runlevel.service
 Before=poweroff.service reboot.service halt.service killall.service
-After=systemd-update-utmp-runlevel.service
 
 [Service]
 Type=oneshot


More information about the systemd-commits mailing list