From 1318b5bb2c6ebc2a810cb899a27daf5d90505559 Mon Sep 17 00:00:00 2001 From: Björn Baumbach Date: Thu, 21 Jun 2012 13:43:22 +0200 Subject: wintest: get original nameserver for forwarding on a more general place Signed-off-by: Kai Blin --- wintest/wintest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wintest/wintest.py b/wintest/wintest.py index d01e94bf65..38c4630eb9 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -325,11 +325,6 @@ nameserver %s def configure_bind(self, kerberos_support=False, include=None): self.chdir('${PREFIX}') - nameserver = self.get_nameserver() - if nameserver == self.getvar('INTERFACE_IP'): - raise RuntimeError("old /etc/resolv.conf must not contain %s as a nameserver, this will create loops with the generated dns configuration" % nameserver) - self.setvar('DNSSERVER', nameserver) - if self.getvar('INTERFACE_IPV6'): ipv6_listen = 'listen-on-v6 port 53 { ${INTERFACE_IPV6}; };' else: @@ -922,6 +917,11 @@ RebootOnCompletion=No self.load_config(self.opts.conf) + nameserver = self.get_nameserver() + if nameserver == self.getvar('INTERFACE_IP'): + raise RuntimeError("old /etc/resolv.conf must not contain %s as a nameserver, this will create loops with the generated dns configuration" % nameserver) + self.setvar('DNSSERVER', nameserver) + self.set_skip(self.opts.skip) self.set_vms(self.opts.vms) -- cgit