chiark / gitweb /
sd-network: fix parameter order for sd_network_monitor_new()
[elogind.git] / src / network / networkd-wait-online.c
index 3ea7a8384ebe15674a98e7c819c08e65b3331dc1..c4783ca2e9e6f44f636947e478be0d58c31df640 100644 (file)
@@ -124,7 +124,7 @@ static bool all_configured(Manager *m) {
 
                 r = sd_rtnl_message_new_link(m->rtnl, &message, RTM_GETLINK, 0);
                 if (r < 0) {
-                        log_warning("colud not create GETLINK message: %s", strerror(-r));
+                        log_warning("could not create GETLINK message: %s", strerror(-r));
                         return false;
                 }
 
@@ -183,7 +183,9 @@ static bool all_configured(Manager *m) {
                         return false;
 
                 r = sd_network_get_link_operational_state(indices[i], &oper_state);
-                if (r >= 0 && streq(oper_state, "carrier"))
+                if (r >= 0 &&
+                    (streq(oper_state, "degraded") ||
+                     streq(oper_state, "routable")))
                         /* we wait for at least one link to be ready,
                            regardless of who manages it */
                         one_ready = true;
@@ -250,7 +252,7 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        r = sd_network_monitor_new(NULL, &m->monitor);
+        r = sd_network_monitor_new(&m->monitor, NULL);
         if (r < 0) {
                 log_error("Could not create monitor: %s", strerror(-r));
                 goto out;