diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-24 13:30:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-29 21:55:52 +0200 |
| commit | 266f3e269d173f104aa2a5e3ceac9b6979ea5039 (patch) | |
| tree | d7587d5adad38a8325ea1fb3e4131492caa1392f /src/cgroups-agent/cgroups-agent.c | |
| parent | 65359589c2c22db881fd9c14e989941c19eff9a1 (diff) | |
bus-util: rename bus_open_transport() to bus_connect_transport()
In sd-bus, the sd_bus_open_xyz() family of calls allocates a new bus,
while sd_bus_default_xyz() family tries to reuse the thread's default
bus. bus_open_transport() sometimes internally uses the former,
sometimes the latter family, but suggests it only calls the former via
its name. Hence, let's avoid this confusion, and generically rename the
call to bus_connect_transport().
Similar for all related calls.
And while we are at it, also change cgls + cgtop to do direct systemd
connections where possible, since all they do is talk to systemd itself.
Diffstat (limited to 'src/cgroups-agent/cgroups-agent.c')
| -rw-r--r-- | src/cgroups-agent/cgroups-agent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c index 612bc8fdec..b79519dd09 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/cgroups-agent/cgroups-agent.c @@ -43,7 +43,7 @@ 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. */ - r = bus_open_system_systemd(&bus); + r = bus_connect_system_systemd(&bus); if (r < 0) { /* If we couldn't connect we assume this was triggered * while systemd got restarted/transitioned from |