|
 |
17094c |
From 543b1cff3c84af062da4d27ba81a9d394f44e4b6 Mon Sep 17 00:00:00 2001
|
|
|
17094c |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
17094c |
Date: Tue, 11 Feb 2020 14:14:20 +0100
|
|
|
17094c |
Subject: [PATCH] dhclient-script: ipv6 uses different variables for
|
|
|
17094c |
nameservers
|
|
|
17094c |
|
|
|
17094c |
new_domain_name_servers and new_domain_search is only provided vit IPv4
|
|
|
17094c |
|
|
|
17094c |
see: https://src.fedoraproject.org/rpms/dhcp/blob/HEAD/f/dhclient-script#_148
|
|
|
17094c |
(cherry picked from commit 962310483f473dbc8d71d70ba464d273b9808d31)
|
|
|
17094c |
|
|
|
17094c |
Resolves: #1795276
|
|
|
17094c |
---
|
|
|
17094c |
modules.d/35network-legacy/dhclient-script.sh | 4 ++--
|
|
|
17094c |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
17094c |
|
|
|
17094c |
diff --git a/modules.d/35network-legacy/dhclient-script.sh b/modules.d/35network-legacy/dhclient-script.sh
|
|
|
17094c |
index fc6ed0a3..f1a60005 100755
|
|
|
17094c |
--- a/modules.d/35network-legacy/dhclient-script.sh
|
|
|
17094c |
+++ b/modules.d/35network-legacy/dhclient-script.sh
|
|
|
17094c |
@@ -75,8 +75,8 @@ setup_interface() {
|
|
|
17094c |
|
|
|
17094c |
setup_interface6() {
|
|
|
17094c |
domain=$new_domain_name
|
|
|
17094c |
- search=$(printf -- "$new_domain_search")
|
|
|
17094c |
- namesrv=$new_domain_name_servers
|
|
|
17094c |
+ search=$(printf -- "$new_dhcp6_domain_search")
|
|
|
17094c |
+ namesrv=$new_dhcp6_name_servers
|
|
|
17094c |
hostname=$new_host_name
|
|
|
17094c |
[ -n "$new_dhcp_lease_time" ] && lease_time=$new_dhcp_lease_time
|
|
|
17094c |
[ -n "$new_max_life" ] && lease_time=$new_max_life
|
|
|
17094c |
|