From 6c2b62eafa0e2224fdc492c55d255228593ad960 Mon Sep 17 00:00:00 2001
From: UnicronNL <kim.sidney@gmail.com>
Date: Tue, 2 Jul 2019 20:49:06 +0200
Subject: T1497: "set system name-server" generates invalid/incorrect
resolv.conf
---
src/conf_mode/host_name.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/conf_mode/host_name.py b/src/conf_mode/host_name.py
index b0a4648c7..43f36dd35 100755
--- a/src/conf_mode/host_name.py
+++ b/src/conf_mode/host_name.py
@@ -124,7 +124,10 @@ def get_config(arguments):
hosts['domain_search'].append(search)
if conf.exists("system name-server"):
- hosts['nameserver'] = conf.return_values("system name-server")
+ if not isinstance(conf.return_values("system name-server"), list):
+ hosts['nameserver'] = conf.return_values("system name-server").replace("'", "").split()
+ else:
+ hosts['nameserver'] = conf.return_values("system name-server")
if conf.exists("system disable-dhcp-nameservers"):
hosts['no_dhcp_ns'] = conf.exists('system disable-dhcp-nameservers')
--
cgit v1.2.3