SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "core/manager: export manager_dbus_is_running" and partially "core: refuse dbus activation if dbus is not running"

Browse Source 
This reverts commit e886315065
and partially 53964fd26b.

Specifically, changes to signal_activation_request()
is not desired.
This commit is contained in:
Mike Yuan
2023-05-12 16:21:44 +08:00
parent bee6e755bb
commit 2b680534c9
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus.c
+3 -2
View File
@@ -160,8 +160,9 @@ static int signal_activation_request(sd_bus_message *message, void *userdata, sd
return 0;
}
if (!manager_dbus_is_running(m)) {
r = sd_bus_error_set(&error, BUS_ERROR_SHUTTING_DOWN, "Refusing activation, D-Bus is not running.");
if (manager_unit_inactive_or_pending(m, SPECIAL_DBUS_SOCKET) ||
manager_unit_inactive_or_pending(m, SPECIAL_DBUS_SERVICE)) {
r = sd_bus_error_set(&error, BUS_ERROR_SHUTTING_DOWN, "Refusing activation, D-Bus is shutting down.");
goto failed;
}
src/core/manager.c
+4 -4
View File
@@ -1801,7 +1801,7 @@ static void manager_distribute_fds(Manager *m, FDSet *fds) {
}
}
bool manager_dbus_is_running_full(Manager *m, bool deserialized) {
static bool manager_dbus_is_running(Manager *m, bool deserialized) {
Unit *u;
assert(m);
@@ -1843,7 +1843,7 @@ static void manager_setup_bus(Manager *m) {
(void) bus_init_system(m);
/* Let's connect to the bus now, but only if the unit is supposed to be up */
if (manager_dbus_is_running_full(m, MANAGER_IS_RELOADING(m))) {
if (manager_dbus_is_running(m, MANAGER_IS_RELOADING(m))) {
(void) bus_init_api(m);
if (MANAGER_IS_SYSTEM(m))
@@ -2935,7 +2935,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
break;
case SIGUSR1:
if (manager_dbus_is_running(m)) {
if (manager_dbus_is_running(m, false)) {
log_info("Trying to reconnect to bus...");
(void) bus_init_api(m);
@@ -4140,7 +4140,7 @@ void manager_recheck_dbus(Manager *m) {
if (MANAGER_IS_RELOADING(m))
return; /* don't check while we are reloading… */
if (manager_dbus_is_running(m)) {
if (manager_dbus_is_running(m, false)) {
(void) bus_init_api(m);
if (MANAGER_IS_SYSTEM(m))
src/core/manager.h
-5
View File
@@ -504,11 +504,6 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *root);
bool manager_dbus_is_running_full(Manager *m, bool deserialized);
static inline bool manager_dbus_is_running(Manager *m) {
return manager_dbus_is_running_full(m, false);
}
Job *manager_get_job(Manager *m, uint32_t id);
Unit *manager_get_unit(Manager *m, const char *name);