From 52af5e901e4e5e7727ae83db18a37730b5f898fe Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 12 Aug 2020 17:35:25 +0200 Subject: [PATCH] initrd: always set "connection.wait-device-timeout" even if profile has no interface-name set Since commit 3df662f534c4 ('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. --- src/initrd/nmi-cmdline-reader.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c index 85be9f132e..be39ef896f 100644 --- a/src/initrd/nmi-cmdline-reader.c +++ b/src/initrd/nmi-cmdline-reader.c @@ -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); }