colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initrd: accept 'infinity' as argument to rd.net.timeout.dhcp

Browse Source 
(cherry picked from commit 97833237bf)
This commit is contained in:
Beniamino Galvani
2021-02-12 09:53:30 +01:00
parent 936c7c9a78
commit 772b213321
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/initrd/nmi-cmdline-reader.c
View File

@@ -1085,8 +1085,12 @@ nmi_cmdline_reader_parse(const char * sysfs_dir,
else if (nm_streq(tag, "rd.peerdns")) else if (nm_streq(tag, "rd.peerdns"))
reader->ignore_auto_dns = !_nm_utils_ascii_str_to_bool(argument, TRUE); reader->ignore_auto_dns = !_nm_utils_ascii_str_to_bool(argument, TRUE);
else if (nm_streq(tag, "rd.net.timeout.dhcp")) { else if (nm_streq(tag, "rd.net.timeout.dhcp")) {
if (nm_streq0(argument, "infinity")) {
reader->dhcp_timeout = G_MAXINT32;
} else {
reader->dhcp_timeout = reader->dhcp_timeout =
_nm_utils_ascii_str_to_int64(argument, 10, 1, G_MAXINT32, reader->dhcp_timeout); _nm_utils_ascii_str_to_int64(argument, 10, 1, G_MAXINT32, reader->dhcp_timeout);
}
} else if (nm_streq(tag, "rd.net.dhcp.vendor-class")) { } else if (nm_streq(tag, "rd.net.dhcp.vendor-class")) {
if (nm_utils_validate_dhcp4_vendor_class_id(argument, NULL)) if (nm_utils_validate_dhcp4_vendor_class_id(argument, NULL))
nm_utils_strdup_reset(&reader->dhcp4_vci, argument); nm_utils_strdup_reset(&reader->dhcp4_vci, argument);

1
src/core/initrd/tests/test-cmdline-reader.c
View File

@@ -240,6 +240,7 @@ test_dhcp_timeout(void)
{NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=0"), 90}, {NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=0"), 90},
{NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=foobar"), 90}, {NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=foobar"), 90},
{NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=42"), 42}, {NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=42"), 42},
{NM_MAKE_STRV("ip=dhcp", "rd.net.timeout.dhcp=infinity"), G_MAXINT32},
}; };
guint i; guint i;