Update upstream source from tag 'upstream/1.42.0'

Update to upstream version '1.42.0'
with Debian dir 2b9fa2718b2bd34fa58008e335a0d81b87ad57cf

1 files changed, 6 insertions, 7 deletions

diff --git a/src/nm-initrd-generator/tests/test-cmdline-reader.c b/src/nm-initrd-generator/tests/test-cmdline-reader.c
index 977e58b9..2dfc23a3 100644
--- a/src/nm-initrd-generator/tests/test-cmdline-reader.c
+++ b/src/nm-initrd-generator/tests/test-cmdline-reader.c
@@ -1680,13 +1680,12 @@ test_ibft_ip_dev(void)
                     NM_SETTING_VLAN_SETTING_NAME);
     g_assert_cmpstr(nm_setting_connection_get_interface_name(s_con), ==, NULL);
 
-    expected_uuid = nm_uuid_generate_from_strings("ibft",
-                                                  s_hwaddr,
-                                                  s_vlanid ? "V" : "v",
-                                                  s_vlanid ? s_vlanid : "",
-                                                  s_ipaddr ? "A" : "DHCP",
-                                                  s_ipaddr ? s_ipaddr : "",
-                                                  NULL);
+    expected_uuid = nm_uuid_generate_from_strings_old("ibft",
+                                                      s_hwaddr,
+                                                      s_vlanid ? "V" : "v",
+                                                      s_vlanid ? s_vlanid : "",
+                                                      s_ipaddr ? "A" : "DHCP",
+                                                      s_ipaddr ? s_ipaddr : "");
 
     g_assert_cmpstr(expected_uuid, ==, "16d9bd1c-e2ab-31ef-9196-860078e81a23");
     g_assert_cmpstr(nm_connection_get_uuid(connection), ==, expected_uuid);