From 91b22f21f3824c1766d34f622c5bbb70cbe881a8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 14 Mar 2011 03:10:09 +0100 Subject: core: move abstract namespace sockets to /dev/.run Now that we have /dev/.run there's no need to use abstract namespace sockets. So, let's move things to /dev/.run, to make things more easily discoverable and improve compat with chroot() and fs namespacing. --- src/cgroups-agent.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/cgroups-agent.c') diff --git a/src/cgroups-agent.c b/src/cgroups-agent.c index 7b4fca245d..18612eca3c 100644 --- a/src/cgroups-agent.c +++ b/src/cgroups-agent.c @@ -49,10 +49,19 @@ int main(int argc, char *argv[]) { * 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:abstract=/org/freedesktop/systemd1/private", &error))) { - log_error("Failed to get D-Bus connection: %s", bus_error_message(&error)); - goto finish; + if (!(bus = dbus_connection_open_private("unix:path=/dev/.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))) { +#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."); -- cgit v1.2.3-54-g00ecf