[SCM] live-debconfig branch, debian-next, updated. debian/4.0_a3-1-14-gc6c1246

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c6c1246c564da89d9863cb56b7e9da5ede5ce107
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 17 12:26:57 2012 +0200

    Adding a workaround in ifupdown script when reading defaults for nameserver addresses from resolv.conf to get rid of newlines as debconf can not handle multiline return values in assignments.

diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index b131095..0dd4042 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -28,6 +28,9 @@ Defaults ()
 	if [ -e /etc/resolv.conf ]
 	then
 		_NAMESERVER_ADDRESSES="${_NAMESERVER_ADDRESSES:-$(if [ -e /etc/resolv.conf ]; then awk '/^nameserver / {$1=""; print $0}' /etc/resolv.conf; fi)}"
+		# Workaround to get rid of newlines since debconf can not handle multiline return value in assignments
+		_NAMESERVER_ADDRESSES="$(echo ${_NAMESERVER_ADDRESSES})"
+
 		_NAMESERVER_DOMAIN="${_NAMESERVER_DOMAIN:-$(if [ -e /etc/resolv.conf ]; then awk '/^domain / {$1=""; print $0}' /etc/resolv.conf; fi)}"
 		_NAMESERVER_SEARCH="${_NAMESERVER_SEARCH:-$(if [ -e /etc/resolv.conf ]; then awk '/^search / {$1=""; print $0}' /etc/resolv.conf; fi)}"
 		_NAMESERVER_OPTIONS="${_NAMESERVER_OPTIONS:-$(if [ -e /etc/resolv.conf ]; then awk '/^options / {$1=""; print $0}' /etc/resolv.conf; fi)}"

-- 
live-debconfig