system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-07 08:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

initrd: always set "connection.wait-device-timeout" even if profile has no interface-name set

Browse source 
Since commit 3df662f534 ('settings: rework wait-device-timeout
handling and consider device compatibility'), "connection.wait-device-timeout"
works with profiles in general and doesn't require an interface-name
set.

Remove that restriction and let initrd generator create profiles that
always wait.
This commit is contained in:
Thomas Haller 2020-08-12 17:35:25 +02:00
parent 63daaa6d21
commit 52af5e901e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/initrd/nmi-cmdline-reader.c
View file

@ -883,11 +883,8 @@ connection_set_needed (NMConnection *connection)
NM_SETTING_WIRED_SETTING_NAME))
return;
if (nm_str_is_empty (nm_setting_connection_get_interface_name (s_con)))
return;
g_object_set (s_con,
NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, NMI_WAIT_DEVICE_TIMEOUT_MS,
NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT, (int) NMI_WAIT_DEVICE_TIMEOUT_MS,
NULL);
}