|
|
|
@ -704,11 +704,11 @@ class VariableOsInstallNetDns(VariableOsInstallNetDnsSearch):
|
|
|
|
|
map(lambda x:x.strip().partition("nameserver")[2].strip(),
|
|
|
|
|
filter(lambda x:x.lstrip().startswith("nameserver"),
|
|
|
|
|
readLinesFile('/etc/resolv.conf'))))
|
|
|
|
|
return "" if self.isDNSByDHCP() else ",".join(dnsIps)
|
|
|
|
|
return "" if self.isDNSByDHCP() else " ".join(dnsIps)
|
|
|
|
|
|
|
|
|
|
def check(self,value):
|
|
|
|
|
reIp = re.compile(ip.IP_ADDR)
|
|
|
|
|
if any(ifilterfalse(reIp.match,value.split(','))):
|
|
|
|
|
if any(ifilterfalse(reIp.match,value.split(' '))):
|
|
|
|
|
raise VariableError(_("Wrong IP address for DNS"))
|
|
|
|
|
|
|
|
|
|
def humanReadable(self):
|
|
|
|
|