fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 05:00:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: respect DEVTIMEOUT when device is not udev initialized (rh #1192633)

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1192633
This commit is contained in:
Jiří Klimeš 2015-08-11 18:16:26 +02:00
commit 9f6cc732f5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
View file

@ -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 */