summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rw-r--r--src/core/busname.c2
-rw-r--r--src/libsystemd/sd-bus/bus-kernel.c13
-rw-r--r--src/libsystemd/sd-bus/bus-kernel.h2
4 files changed, 16 insertions, 2 deletions
diff --git a/TODO b/TODO
index b76db091e8..9406ce852b 100644
--- a/TODO
+++ b/TODO
@@ -166,7 +166,6 @@ Features:
- bus proxy should fake seclabel when connecting to kdbus
- allow updating attach flags during runtime
- pid1: peek into activating message when activating a service
- - when service activation failed, drop one message from the activator queue
* sd-event
- allow multiple signal handlers per signal?
diff --git a/src/core/busname.c b/src/core/busname.c
index 9b6bf07d9f..0d19311db1 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -337,8 +337,8 @@ static void busname_enter_running(BusName *n) {
log_debug_unit(UNIT(n)->id, "Suppressing activation request on %s since unit stop is scheduled.", UNIT(n)->id);
/* Flush all queued activation reqeuest by closing and reopening the connection */
+ bus_kernel_drop_one(n->starter_fd);
- busname_close_fd(n);
busname_enter_listening(n);
return;
}
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index a33e7a323c..b46cada648 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -1476,3 +1476,16 @@ int bus_kernel_try_close(sd_bus *bus) {
return 0;
}
+
+int bus_kernel_drop_one(int fd) {
+ struct kdbus_cmd_recv recv = {
+ .flags = KDBUS_RECV_DROP
+ };
+
+ assert(fd >= 0);
+
+ if (ioctl(fd, KDBUS_CMD_MSG_RECV, &recv) < 0)
+ return -errno;
+
+ return 0;
+}
diff --git a/src/libsystemd/sd-bus/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
index e9f776d9fd..de02b84f88 100644
--- a/src/libsystemd/sd-bus/bus-kernel.h
+++ b/src/libsystemd/sd-bus/bus-kernel.h
@@ -79,3 +79,5 @@ int kdbus_translate_request_name_flags(uint64_t sd_bus_flags, uint64_t *kdbus_fl
int kdbus_translate_attach_flags(uint64_t sd_bus_flags, uint64_t *kdbus_flags);
int bus_kernel_try_close(sd_bus *bus);
+
+int bus_kernel_drop_one(int fd);