From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 Feb 2011 15:39:24 +0000 (+0100)
Subject: builder: Use system /etc/resolv.conf and /etc/hosts for name resolution.
X-Git-Tag: 0.9.3~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=189739672a89c8325777484809b3fe9fb8a09dfe;p=pakfire.git

builder: Use system /etc/resolv.conf and /etc/hosts for name resolution.
---

diff --git a/pakfire/builder.py b/pakfire/builder.py
index 34b66d78e..86b0540aa 100644
--- a/pakfire/builder.py
+++ b/pakfire/builder.py
@@ -249,26 +249,12 @@ class Builder(object):
 		f.close()
 
 	def _prepare_dns(self):
-		# XXX to be replaced
-		# maybe we can copyin /etc/resolv.conf and /etc/hosts
-		nameservers = []
-		f = open("/etc/resolv.conf")
-		for line in f.readlines():
-			if line.startswith("nameserver"):
-				nameservers.append(line.split(" ")[-1].strip())
-		f.close()
-
-		logging.debug("Using nameservers: %s" % nameservers)
-
-		f = open(self.chrootPath("etc", "resolv.conf"), "w")
-		for nameserver in nameservers:
-			f.write("nameserver %s" % nameserver)
-		f.close()
-
-		logging.debug("Creating record for localhost")
-		f = open(self.chrootPath("etc", "hosts"), "w")
-		f.write("127.0.0.1 localhost\n")
-		f.close()
+		"""
+			Add DNS resolution facility to chroot environment by copying
+			/etc/resolv.conf and /etc/hosts.
+		"""
+		for i in ("/etc/resolv.conf", "/etc/hosts"):
+			self.copyin(i, i)
 
 	def _create_node(self, filename, mode, device):
 		logging.debug("Create node: %s (%s)" % (filename, mode))