fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-22 11:10:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

initrd: rename NMI_WAIT_DEVICE_TIMEOUT_MS to _MSEC

Browse source
This commit is contained in:
Beniamino Galvani 2021-07-05 09:48:54 +02:00
parent 581092b078
commit fa42ba9df2
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nm-initrd-generator/nm-initrd-generator.h
View file

@ -9,7 +9,7 @@
#include "nm-connection.h"
#include "nm-utils.h"
#define NMI_WAIT_DEVICE_TIMEOUT_MS 60000
#define NMI_WAIT_DEVICE_TIMEOUT_MSEC 60000
static inline int
get_ip_address_family(const char *str, gboolean with_prefix)

2
src/nm-initrd-generator/nmi-cmdline-reader.c
View file

@ -1062,7 +1062,7 @@ connection_set_needed(NMConnection *connection)
g_object_set(s_con,
NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
(int) NMI_WAIT_DEVICE_TIMEOUT_MS,
(int) NMI_WAIT_DEVICE_TIMEOUT_MSEC,
NULL);
}

10
src/nm-initrd-generator/tests/test-cmdline-reader.c
View file

@ -702,7 +702,7 @@ test_multiple_bootdev(void)
g_assert(s_con);
g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
==,
NMI_WAIT_DEVICE_TIMEOUT_MS);
NMI_WAIT_DEVICE_TIMEOUT_MSEC);
s_ip4 = nm_connection_get_setting_ip4_config(connection);
g_assert(s_ip4);
g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4), ==, NM_SETTING_IP4_CONFIG_METHOD_AUTO);
@ -744,7 +744,7 @@ test_bootdev(void)
g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "ens3");
g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
==,
NMI_WAIT_DEVICE_TIMEOUT_MS);
NMI_WAIT_DEVICE_TIMEOUT_MSEC);
connection = g_hash_table_lookup(connections, "vlan2");
nmtst_assert_connection_verifies_without_normalization(connection);
@ -1922,7 +1922,7 @@ test_neednet(void)
g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eno1");
g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
==,
NMI_WAIT_DEVICE_TIMEOUT_MS);
NMI_WAIT_DEVICE_TIMEOUT_MSEC);
connection = g_hash_table_lookup(connections, "eno2");
nmtst_assert_connection_verifies_without_normalization(connection);
@ -1931,7 +1931,7 @@ test_neednet(void)
g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eno2");
g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
==,
NMI_WAIT_DEVICE_TIMEOUT_MS);
NMI_WAIT_DEVICE_TIMEOUT_MSEC);
connection = g_hash_table_lookup(connections, "eno3");
nmtst_assert_connection_verifies_without_normalization(connection);
@ -1940,7 +1940,7 @@ test_neednet(void)
g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, "eno3");
g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con),
==,
NMI_WAIT_DEVICE_TIMEOUT_MS);
NMI_WAIT_DEVICE_TIMEOUT_MSEC);
connection = g_hash_table_lookup(connections, "br0");
nmtst_assert_connection_verifies_without_normalization(connection);