diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-16 15:18:59 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-08-11 18:11:55 +0200 |
| commit | 6608331aec627aa9255618ae615e10c57c09c7c3 (patch) | |
| tree | 868ef486af2129add5628df53e95e26c92853fcd | |
| parent | ecdf7cba6bc0f9fd4f0e45579e1b271717411f57 (diff) | |
| download | NetworkManager-6608331aec627aa9255618ae615e10c57c09c7c3.tar.gz | |
ifcfg-rh: reorder checks in nm_ifcfg_connection_check_devtimeout()
Move the check for a platform link before devtimeout_from_file(). The
check in the platform cache should be more performant and yield success
in most cases.
This can save reading and parsing the ifcfg-rh file.
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 8fb68154b4..d4e3cf704f 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -162,14 +162,15 @@ nm_ifcfg_connection_check_devtimeout (NMIfcfgConnection *self) filename = nm_settings_connection_get_filename (NM_SETTINGS_CONNECTION (self)); if (!filename) return; - devtimeout = devtimeout_from_file (filename); - if (!devtimeout) - return; pllink = nm_platform_link_get_by_ifname (NM_PLATFORM_GET, ifname); if (pllink && pllink->initialized) return; + devtimeout = devtimeout_from_file (filename); + if (!devtimeout) + return; + /* ONBOOT=yes, DEVICE and DEVTIMEOUT are set, but device is not present */ nm_settings_connection_set_ready (NM_SETTINGS_CONNECTION (self), FALSE); |