[Piuparts-commits] [piuparts] 03/15: p: preserve domain setting in /etc/resolv.conf

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit 562a0102f00478434bebc1ecdddc45e5a4d90b6f
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Nov 30 16:08:51 2014 +0100

    p: preserve domain setting in /etc/resolv.conf
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 4 ++--
 piuparts.py      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66ea03c..247d782 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,8 @@ piuparts (0.61) UNRELEASED; urgency=medium
   * piuparts.py:
     - Add to ignored_files:
       + /etc/modules-load.d/modules.conf  (dangling symlink to ../modules)
-    - Create /etc/resolv.conf in the chroot using only the nameserver entries
-      found on the host.
+    - Create /etc/resolv.conf in the chroot using only the domain and
+      nameserver entries found on the host.
   * lib/dwke.py: Fix parsing known_problems/*.conf using EXCLUDE_PATTERN.
   * Add "AddDefaultCharset utf-8" to the apache2 configuration snipplet
     example, so that logfiles are displayed as UTF-8.
diff --git a/piuparts.py b/piuparts.py
index b9d1359..bd1f1d1 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -948,7 +948,7 @@ class Chroot:
         nameservers = ""
         with open("/etc/resolv.conf", "r") as f:
             for line in f:
-                if line.startswith("nameserver"):
+                if line.startswith("nameserver") or line.startswith("domain"):
                     nameservers += line
         create_file(full_name, nameservers)
         logging.debug("Created resolv.conf.")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git