diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2021-07-05 09:48:54 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2021-07-05 15:15:44 +0200 |
| commit | fa42ba9df267765cd6f7456707d932271e1252a0 (patch) | |
| tree | e424110769ee32bd22acd3bfe3bb7b75b06aeaca | |
| parent | 581092b078f8e8d4fafbc29b47c45b3a81099110 (diff) | |
| download | NetworkManager-fa42ba9df267765cd6f7456707d932271e1252a0.tar.gz | |
initrd: rename NMI_WAIT_DEVICE_TIMEOUT_MS to _MSEC
| -rw-r--r-- | src/nm-initrd-generator/nm-initrd-generator.h | 2 | ||||
| -rw-r--r-- | src/nm-initrd-generator/nmi-cmdline-reader.c | 2 | ||||
| -rw-r--r-- | src/nm-initrd-generator/tests/test-cmdline-reader.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/nm-initrd-generator/nm-initrd-generator.h b/src/nm-initrd-generator/nm-initrd-generator.h index 56dcfd68f3..534edcb783 100644 --- a/src/nm-initrd-generator/nm-initrd-generator.h +++ b/src/nm-initrd-generator/nm-initrd-generator.h @@ -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) diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 799fd5dcc0..0a7e0d64e2 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -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); } diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c index 5cb11e872a..d526a3b76c 100644 --- a/src/nm-initrd-generator/tests/test-cmdline-reader.c +++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c @@ -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); |