X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcgroups-agent.c;h=7a6173e2a26fed3d5f03226036a9c80150ec315e;hb=90ccc3fca7e53a60a9e67b9d5812e1d4a27fc07d;hp=92b56c5fbd7f080c37f33a6abf033002ca870f95;hpb=2396fb04f78eaa9842c747e384218f0069446960;p=elogind.git
diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c
index 92b56c5fb..7a6173e2a 100644
--- a/src/cgroups-agent.c
+++ b/src/cgroups-agent.c
@@ -6,21 +6,23 @@
Copyright 2010 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
#include
+#include
+
#include "log.h"
#include "dbus-common.h"
@@ -28,7 +30,7 @@ int main(int argc, char *argv[]) {
DBusError error;
DBusConnection *bus = NULL;
DBusMessage *m = NULL;
- int r = 1;
+ int r = EXIT_FAILURE;
dbus_error_init(&error);
@@ -37,26 +39,32 @@ int main(int argc, char *argv[]) {
goto finish;
}
- log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+ log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
- /* 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))) {
+ /* We send this event to the private D-Bus socket and then the
+ * system instance will forward this to the system bus. We do
+ * this to avoid an activation loop when we start dbus when we
+ * are called when the dbus service is shut down. */
+ if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) {
+#ifndef LEGACY
dbus_error_free(&error);
+ /* Retry with the pre v21 socket name, to ease upgrades */
if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
- log_error("Failed to get D-Bus connection: %s", error.message);
+#endif
+ log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
goto finish;
}
+#ifndef LEGACY
+ }
+#endif
- if (bus_check_peercred(bus) < 0) {
- log_error("Bus owner not root.");
- 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"))) {
@@ -72,14 +80,15 @@ int main(int argc, char *argv[]) {
}
if (!dbus_connection_send(bus, m, NULL)) {
- log_error("Failed to send signal message.");
+ log_error("Failed to send signal message on private connection.");
goto finish;
}
- r = 0;
+ r = EXIT_SUCCESS;
finish:
if (bus) {
+ dbus_connection_flush(bus);
dbus_connection_close(bus);
dbus_connection_unref(bus);
}