diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-05-04 15:55:12 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-05-26 15:33:58 +0200 |
| commit | 5adb4d2e4e647cae953aada0ae8cdfe92bdd6d48 (patch) | |
| tree | cd4d6f1ca85b3e8de72ca79381d4d78e2440004d /src/platform/nm-platform.c | |
| parent | 4a4f703c94787b39f9df4ca10e329b7ccff5f0fc (diff) | |
| download | NetworkManager-jk/master-test.tar.gz | |
platform: merge setup_devices() function into constructed()jk/master-test
We already populate the netlink cache in constructed(). No need
to wait with udev devices until nm_platform_query_devices(). Just
do it right away.
Add a hack to keep 'lo' default-unmanaged. Now that we load
udev devices earlier, we end up clearing the default-unmanged
flag on 'lo', which has bad consequences.
(cherry picked from commit f447c7edad362e6f63a91eb3550290f64f052eff)
Diffstat (limited to 'src/platform/nm-platform.c')
| -rw-r--r-- | src/platform/nm-platform.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 13d2d6f112..e521fb1552 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -405,10 +405,6 @@ nm_platform_query_devices (NMPlatform *self) NM_PLATFORM_REASON_INTERNAL); } g_array_unref (links_array); - - /* Platform specific device setup. */ - if (klass->setup_devices) - klass->setup_devices (self); } /** |