Revert "core/manager: export manager_dbus_is_running" and partially "core: refuse...

This reverts commit e8863150653931ae2ffc91757623f179ce763628
and partially 53964fd26b4a01191609ffc064aa8ccccd28e377.

Specifically, changes to signal_activation_request()
is not desired.

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 2f5feeaec342ff5389a5fbfe8cab091ad6553ec5..c41e1a6c74630213d6823acbfccac650f22991cb 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -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;
         }
 

diff --git a/src/core/manager.c b/src/core/manager.c
index ec8851ca223e162ae8be3ae9016b51775a390b47..36881de479038a997ea2c352aaf597d6872f6f08 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -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))

diff --git a/src/core/manager.h b/src/core/manager.h
index 951d46222eeff5bc154051372d87565674243221..486eda11b604be3e9f2cfd285883e0ae8f9c3b26 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -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);