summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-06 03:21:50 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-06 03:21:50 +0200
commit3c661fadd5e0d74acc7596024db31be00c53b448 (patch)
treeab14830c6eef7b0e03a909e3df1873683a7c5ea3
parent2e81c8a55785d33e48c6d512e094a3a7dd0bf900 (diff)
cgroup: if the system bus cannot be found, send cgroup empty msg directly to init proces
-rw-r--r--Makefile.am3
-rw-r--r--src/cgroups-agent.c21
-rw-r--r--src/dbus.c15
3 files changed, 36 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 3c54043975..00765a7c3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -479,7 +479,8 @@ systemd_initctl_LDADD = \
$(DBUS_LIBS)
systemd_cgroups_agent_SOURCES = \
- src/cgroups-agent.c
+ src/cgroups-agent.c \
+ src/dbus-common.c
systemd_cgroups_agent_CFLAGS = \
$(AM_CFLAGS) \
diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index d3db151b18..a1eac1459e 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -22,6 +22,7 @@
#include <dbus/dbus.h>
#include "log.h"
+#include "dbus-common.h"
int main(int argc, char *argv[]) {
DBusError error;
@@ -36,9 +37,25 @@ int main(int argc, char *argv[]) {
goto finish;
}
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_parse_environment();
+
+ /* If possible we go via the system bus, to make sure that
+ * session instances get the messages. If not possible we talk
+ * to the system instance directly. */
if (!(bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) {
- log_error("Failed to get D-Bus connection: %s", error.message);
- goto finish;
+
+ dbus_error_free(&error);
+
+ if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
+ log_error("Failed to get D-Bus connection: %s", error.message);
+ goto finish;
+ }
+
+ if (bus_check_peercred(bus) < 0) {
+ log_error("Bus owner not root.");
+ goto finish;
+ }
}
if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) {
diff --git a/src/dbus.c b/src/dbus.c
index 0b93db55de..0ab55b8539 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -474,11 +474,14 @@ static DBusHandlerResult system_bus_message_filter(DBusConnection *connection, D
static DBusHandlerResult private_bus_message_filter(DBusConnection *connection, DBusMessage *message, void *data) {
Manager *m = data;
+ DBusError error;
assert(connection);
assert(message);
assert(m);
+ dbus_error_init(&error);
+
if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_METHOD_CALL ||
dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_SIGNAL)
log_debug("Got D-Bus request: %s.%s() on %s",
@@ -488,6 +491,18 @@ static DBusHandlerResult private_bus_message_filter(DBusConnection *connection,
if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected"))
shutdown_connection(m, connection);
+ else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Agent", "Released")) {
+ const char *cgroup;
+
+ if (!dbus_message_get_args(message, &error,
+ DBUS_TYPE_STRING, &cgroup,
+ DBUS_TYPE_INVALID))
+ log_error("Failed to parse Released message: %s", error.message);
+ else
+ cgroup_notify_empty(m, cgroup);
+ }
+
+ dbus_error_free(&error);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}