[systemd-commits] 3 commits - src/core units/systemd-bus-driverd.service.in units/systemd-bus-proxyd at .service.in units/systemd-machined.service.in

[Lennart Poettering]

 src/core/manager.c                   |    4 +++-
 units/systemd-bus-driverd.service.in |    1 +
 units/systemd-bus-proxyd at .service.in |    1 +
 units/systemd-machined.service.in    |    2 --
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit be04cbca6c2c03e9f62e8981cb9b5626c118c953
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Dec 23 21:01:32 2013 +0100

    core: when we close the notify fd, we also need to free its event source

diff --git a/src/core/manager.c b/src/core/manager.c
index d8d5667..c26dcaa 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2208,8 +2208,10 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
                         if (safe_atoi(l + 10, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
                                 log_debug("Failed to parse notify fd: %s", l + 10);
                         else {
-                                if (m->notify_fd >= 0)
+                                if (m->notify_fd >= 0) {
+                                        m->notify_event_source = sd_event_source_unref(m->notify_event_source);
                                         close_nointr_nofail(m->notify_fd);
+                                }
 
                                 m->notify_fd = fdset_remove(fds, fd);
                         }

commit 9a8112f5e9f1d80bf1740fe507185f992ab3c34c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Dec 23 20:37:03 2013 +0100

    units: systemd-machined now exits on idle and we shouldn't try to restart it then

diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
index a23dca9..2679dce 100644
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -14,8 +14,6 @@ After=machine.slice
 
 [Service]
 ExecStart=@rootlibexecdir@/systemd-machined
-Restart=always
-RestartSec=0
 BusName=org.freedesktop.machine1
 CapabilityBoundingSet=CAP_KILL
 WatchdogSec=1min

commit 5326b03f30b6b1d50437766afc09598a8be89f8f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Dec 23 20:37:00 2013 +0100

    units: limit caps for bus proxyd and driverd services

diff --git a/units/systemd-bus-driverd.service.in b/units/systemd-bus-driverd.service.in
index 575bddc..0bda403 100644
--- a/units/systemd-bus-driverd.service.in
+++ b/units/systemd-bus-driverd.service.in
@@ -12,3 +12,4 @@ Description=Bus Driver Service
 ExecStart=@rootlibexecdir@/systemd-bus-driverd
 BusName=org.freedesktop.DBus
 WatchdogSec=1min
+CapabilityBoundingSet=CAP_IPC_OWNER
diff --git a/units/systemd-bus-proxyd at .service.in b/units/systemd-bus-proxyd at .service.in
index 0711b48..1bdb459 100644
--- a/units/systemd-bus-proxyd at .service.in
+++ b/units/systemd-bus-proxyd at .service.in
@@ -14,3 +14,4 @@ Description=Legacy D-Bus Protocol Compatibility Daemon
 # space available for this.
 ExecStart=@rootlibexecdir@/systemd-bus-proxyd xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 NotifyAccess=main
+CapabilityBoundingSet=CAP_IPC_OWNER