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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 976e19585471d8576168585270900915bc31dac5
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 17 11:18:54 2012 +0200

    Adding whitespace seperaters in generated resolv.conf in ifupdown script.

diff --git a/scripts/debconfig/0020-ifupdown b/scripts/debconfig/0020-ifupdown
index 43e9bfd..e656a47 100755
--- a/scripts/debconfig/0020-ifupdown
+++ b/scripts/debconfig/0020-ifupdown
@@ -338,6 +338,11 @@ fi
 
 if [ -n "${_NAMESERVER_ADDRESSES}" ]
 then
+	if [ -e /etc/resolv.conf.tmp ]
+	then
+		echo "" >> /etc/resolv.conf.tmp
+	fi
+
 	for _NAMESERVER_ADDRESS in $(echo ${_NAMESERVER_ADDRESSES} | sed -e 's|,| |g')
 	do
 		echo "nameserver ${_NAMESERVER_ADDRESS}" >> /etc/resolv.conf.tmp
@@ -346,6 +351,11 @@ fi
 
 if [ -n "${_NAMESERVER_OPTIONS}" ]
 then
+	if [ -e /etc/resolv.conf.tmp ]
+	then
+		echo "" >> /etc/resolv.conf.tmp
+	fi
+
 	echo "options ${_NAMESERVER_OPTIONS}" >> /etc/resolv.conf.tmp
 fi
 

-- 
live-debconfig