picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: add SD_BUS_NAME_REPLACE_EXISTING to all activatable services, fix one flags conversion

Browse source
This commit is contained in:
Kay Sievers 2013-12-12 06:23:38 +01:00
parent 29a07cdb4a
commit d90bb66996
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hostname/hostnamed.c
View file

@ -574,7 +574,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r;
}
r = sd_bus_request_name(bus, "org.freedesktop.hostname1", 0);
r = sd_bus_request_name(bus, "org.freedesktop.hostname1", SD_BUS_NAME_REPLACE_EXISTING);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;

2
src/libsystemd-bus/bus-kernel.c
View file

@ -1020,7 +1020,7 @@ int kdbus_translate_request_name_flags(uint64_t flags, uint64_t *kdbus_flags) {
if (flags & SD_BUS_NAME_REPLACE_EXISTING)
f |= KDBUS_NAME_REPLACE_EXISTING;
if (!(flags & SD_BUS_NAME_QUEUE))
if (flags & SD_BUS_NAME_QUEUE)
f |= KDBUS_NAME_QUEUE;
*kdbus_flags = f;

2
src/locale/localed.c
View file

@ -1094,7 +1094,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r;
}
r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
r = sd_bus_request_name(bus, "org.freedesktop.locale1", SD_BUS_NAME_REPLACE_EXISTING);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;

2
src/login/logind.c
View file

@ -727,7 +727,7 @@ static int manager_connect_bus(Manager *m) {
return r;
}
r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0);
r = sd_bus_request_name(m->bus, "org.freedesktop.login1", SD_BUS_NAME_REPLACE_EXISTING);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;

2
src/machine/machined.c
View file

@ -219,7 +219,7 @@ static int manager_connect_bus(Manager *m) {
return r;
}
r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", 0);
r = sd_bus_request_name(m->bus, "org.freedesktop.machine1", SD_BUS_NAME_REPLACE_EXISTING);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;

2
src/timedate/timedated.c
View file

@ -791,7 +791,7 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r;
}
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", SD_BUS_NAME_REPLACE_EXISTING);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;