networkd: simplify sd_bus_is_ready() checks

Also add "system" in the messages, because we set the internal value,
and are just skipping the setting of the external value, so the message
could be confusing without that clarification.

diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
index 0de1892fc955bbdc97d662c3f4d99b3c2dc50469..9677dfb0c36b39e4998613f8b1153ea1c2453302 100644 (file)
--- a/src/network/networkd-dhcp-common.c
+++ b/src/network/networkd-dhcp-common.c
@@ -167,7 +167,7 @@ int manager_request_product_uuid(Manager *m, Link *link) {
                         return log_oom();
         }
 
-        if (!m->bus || sd_bus_is_ready(m->bus) <= 0) {
+        if (sd_bus_is_ready(m->bus) <= 0) {
                 log_debug("Not connected to system bus, requesting product UUID later.");
                 return 0;
         }

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 841d76b46118a386cd1146a5cbe9ec9e793a4dbb..3311dafd6a206aa4eb6515731472542dd9191d54 100644 (file)
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -854,7 +854,7 @@ int link_send_changed_strv(Link *link, char **properties) {
         assert(link->manager);
         assert(properties);
 
-        if (!link->manager->bus || sd_bus_is_ready(link->manager->bus) <= 0)
+        if (sd_bus_is_ready(link->manager->bus) <= 0)
                 return 0;
 
         p = link_bus_path(link);

diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index a08dff58e751b57a3ceda0da321d6d65728d2d09..138d76541415a2d0fa8b73df34d455342421eb83 100644 (file)
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -339,7 +339,7 @@ int manager_send_changed_strv(Manager *manager, char **properties) {
         assert(manager);
         assert(properties);
 
-        if (!manager->bus || sd_bus_is_ready(manager->bus) <= 0)
+        if (sd_bus_is_ready(manager->bus) <= 0)
                 return 0;
 
         return sd_bus_emit_properties_changed_strv(

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index bfdb1f8c96643574015257448cbcbb1ea7a453dd..a8db2cc44bb437458cab93c52670b39d1891c6ac 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -767,8 +767,8 @@ int manager_set_hostname(Manager *m, const char *hostname) {
         if (r < 0)
                 return r;
 
-        if (!m->bus || sd_bus_is_ready(m->bus) <= 0) {
-                log_debug("Not connected to system bus, setting hostname later.");
+        if (sd_bus_is_ready(m->bus) <= 0) {
+                log_debug("Not connected to system bus, setting system hostname later.");
                 return 0;
         }
 
@@ -784,7 +784,6 @@ int manager_set_hostname(Manager *m, const char *hostname) {
                         "sb",
                         hostname,
                         false);
-
         if (r < 0)
                 return log_error_errno(r, "Could not set transient hostname: %m");
 
@@ -817,8 +816,8 @@ int manager_set_timezone(Manager *m, const char *tz) {
         if (r < 0)
                 return r;
 
-        if (!m->bus || sd_bus_is_ready(m->bus) <= 0) {
-                log_debug("Not connected to system bus, setting timezone later.");
+        if (sd_bus_is_ready(m->bus) <= 0) {
+                log_debug("Not connected to system bus, setting system timezone later.");
                 return 0;
         }