diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-08-11 18:16:26 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-08-11 18:16:26 +0200 |
| commit | 9f6cc732f51c4cc5ea2d80d114e383ef3e383afa (patch) | |
| tree | 868ef486af2129add5628df53e95e26c92853fcd | |
| parent | a6e3a60844aa9e2c4d24afe5b7945e0a6292dd04 (diff) | |
| parent | 6608331aec627aa9255618ae615e10c57c09c7c3 (diff) | |
| download | NetworkManager-9f6cc732f51c4cc5ea2d80d114e383ef3e383afa.tar.gz | |
merge: respect DEVTIMEOUT when device is not udev initialized (rh #1192633)
https://bugzilla.redhat.com/show_bug.cgi?id=1192633
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 9 |
1 files changed, 6 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 acb5b1ece2..d4e3cf704f 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -150,6 +150,7 @@ nm_ifcfg_connection_check_devtimeout (NMIfcfgConnection *self) const char *ifname; const char *filename; guint devtimeout; + const NMPlatformLink *pllink; s_con = nm_connection_get_setting_connection (NM_CONNECTION (self)); @@ -161,11 +162,13 @@ 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) + + pllink = nm_platform_link_get_by_ifname (NM_PLATFORM_GET, ifname); + if (pllink && pllink->initialized) return; - if (nm_platform_link_get_ifindex (NM_PLATFORM_GET, ifname) != 0) + devtimeout = devtimeout_from_file (filename); + if (!devtimeout) return; /* ONBOOT=yes, DEVICE and DEVTIMEOUT are set, but device is not present */ |