chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core,logind,networkd: don't pick up devices from udev before they finished udev initi...
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index 724e5e5a47f654c27103115d710ffd400907b7d3..6998562dc06cd94b8af01fcecdefe50000084a0f 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-157,48
+157,41
@@
static int manager_process_link(Manager *m, struct udev_device *device) {
}
int manager_udev_enumerate_links(Manager *m) {
}
int manager_udev_enumerate_links(Manager *m) {
+ _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
struct udev_list_entry *item = NULL, *first = NULL;
struct udev_list_entry *item = NULL, *first = NULL;
- struct udev_enumerate *e;
int r;
assert(m);
e = udev_enumerate_new(m->udev);
int r;
assert(m);
e = udev_enumerate_new(m->udev);
- if (!e) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!e)
+ return -ENOMEM;
r = udev_enumerate_add_match_subsystem(e, "net");
if (r < 0)
r = udev_enumerate_add_match_subsystem(e, "net");
if (r < 0)
-
goto finish
;
+
return r
;
r = udev_enumerate_scan_devices(e);
if (r < 0)
r = udev_enumerate_scan_devices(e);
if (r < 0)
-
goto finish
;
+
return r
;
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
-
struct udev_device *d
;
+
_cleanup_udev_device_unref_ struct udev_device *d = NULL
;
int k;
d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
int k;
d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item));
- if (!d) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!d)
+ return -ENOMEM;
- k = manager_process_link(m, d);
-
udev_device_unref(d)
;
+ if (!udev_device_get_is_initialized(d))
+
continue
;
+ k = manager_process_link(m, d);
if (k < 0)
r = k;
}
if (k < 0)
r = k;
}
-finish:
- if (e)
- udev_enumerate_unref(e);
-
return r;
}
return r;
}