morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

resolve: ignore nameserver= and domain= kernel command line options without value

Browse Source 
Otherwise, manager_parse_dns_server_string_and_warn() or
manager_parse_search_domains_and_warn() will trigger assertion.
This commit is contained in:
Yu Watanabe
2023-08-09 03:00:34 +09:00
parent 5a96b32dea
commit 91acee9906
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/resolve/resolved-conf.c
View File

@@ -518,6 +518,10 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
* interpret, for example dracut and SUSE Linux. */
if (proc_cmdline_key_streq(key, "nameserver")) {
if (proc_cmdline_value_missing(key, value))
return 0;
if (!info->dns_server_unlinked) {
/* The kernel command line overrides any prior configuration */
dns_server_unlink_all(manager_get_first_dns_server(info->manager, DNS_SERVER_SYSTEM));
@@ -532,6 +536,9 @@ static int proc_cmdline_callback(const char *key, const char *value, void *data)
} else if (proc_cmdline_key_streq(key, "domain")) {
if (proc_cmdline_value_missing(key, value))
return 0;
if (!info->search_domain_unlinked) {
dns_search_domain_unlink_all(info->manager->search_domains);
info->search_domain_unlinked = true;