chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tty-ask-password-agent: modernization
[elogind.git]
/
src
/
network
/
networkd-wait-online.c
diff --git
a/src/network/networkd-wait-online.c
b/src/network/networkd-wait-online.c
index a42fef26b99c926ca4f980a317ffda27583d2c53..c6038c63bfaa77d534e86de38a83d3de7ca354ed 100644
(file)
--- a/
src/network/networkd-wait-online.c
+++ b/
src/network/networkd-wait-online.c
@@
-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) {
r = sd_rtnl_message_new_link(m->rtnl, &message, RTM_GETLINK, 0);
if (r < 0) {
- log_warning("co
lu
d not create GETLINK message: %s", strerror(-r));
+ log_warning("co
ul
d not create GETLINK message: %s", strerror(-r));
return false;
}
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);
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;
/* we wait for at least one link to be ready,
regardless of who manages it */
one_ready = true;
@@
-202,6
+204,8
@@
static int monitor_event_handler(sd_event_source *s, int fd, uint32_t revents,
if (all_configured(m))
sd_event_exit(m->event, 0);
if (all_configured(m))
sd_event_exit(m->event, 0);
+ sd_network_monitor_flush(m->monitor);
+
return 1;
}
return 1;
}
@@
-218,7
+222,6
@@
void manager_free(Manager *m) {
int main(int argc, char *argv[]) {
_cleanup_manager_free_ Manager *m = NULL;
_cleanup_event_source_unref_ sd_event_source *event_source = NULL;
int main(int argc, char *argv[]) {
_cleanup_manager_free_ Manager *m = NULL;
_cleanup_event_source_unref_ sd_event_source *event_source = NULL;
- _cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL;
int r, fd, events;
umask(0022);
int r, fd, events;
umask(0022);
@@
-237,25
+240,31
@@
int main(int argc, char *argv[]) {
if (!m)
return log_oom();
if (!m)
return log_oom();
- r = sd_
network_monitor_new(NULL, &monitor
);
+ r = sd_
event_new(&m->event
);
if (r < 0) {
if (r < 0) {
- log_error("Could not create
monitor
: %s", strerror(-r));
+ log_error("Could not create
event
: %s", strerror(-r));
goto out;
}
goto out;
}
- r = sd_
event_new(&m->event
);
+ r = sd_
rtnl_open(&m->rtnl, 0
);
if (r < 0) {
if (r < 0) {
- log_error("Could not create
event
: %s", strerror(-r));
+ log_error("Could not create
rtnl
: %s", strerror(-r));
goto out;
}
goto out;
}
- fd = sd_network_monitor_get_fd(monitor);
+ r = sd_network_monitor_new(NULL, &m->monitor);
+ if (r < 0) {
+ log_error("Could not create monitor: %s", strerror(-r));
+ goto out;
+ }
+
+ fd = sd_network_monitor_get_fd(m->monitor);
if (fd < 0) {
log_error("Could not get monitor fd: %s", strerror(-r));
goto out;
}
if (fd < 0) {
log_error("Could not get monitor fd: %s", strerror(-r));
goto out;
}
- events = sd_network_monitor_get_events(monitor);
+ events = sd_network_monitor_get_events(m
->m
onitor);
if (events < 0) {
log_error("Could not get monitor events: %s", strerror(-r));
goto out;
if (events < 0) {
log_error("Could not get monitor events: %s", strerror(-r));
goto out;
@@
-268,12
+277,6
@@
int main(int argc, char *argv[]) {
goto out;
}
goto out;
}
- r = sd_rtnl_open(&m->rtnl, 0);
- if (r < 0) {
- log_error("Could not create rtnl: %s", strerror(-r));
- goto out;
- }
-
if (all_configured(m)) {
r = 0;
goto out;
if (all_configured(m)) {
r = 0;
goto out;