From owner-svn-src-head@FreeBSD.ORG  Sat Jun  4 12:51:22 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 933FD106564A;
	Sat,  4 Jun 2011 12:51:22 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8387C8FC0A;
	Sat,  4 Jun 2011 12:51:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p54CpM4R010787;
	Sat, 4 Jun 2011 12:51:22 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p54CpM8u010785;
	Sat, 4 Jun 2011 12:51:22 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201106041251.p54CpM8u010785@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 4 Jun 2011 12:51:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222681 - head/usr.sbin/bsdinstall/scripts
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2011 12:51:22 -0000

Author: bz
Date: Sat Jun  4 12:51:22 2011
New Revision: 222681
URL: http://svn.freebsd.org/changeset/base/222681

Log:
  Fix resolv.conf search list creation:
  1) do not print out an empty "search ", things do not like it.
  2) the search list is not comma separated.
  
  Sponsored by:	The FreeBSD Foundation
  Sponsored by:	iXsystems

Modified:
  head/usr.sbin/bsdinstall/scripts/netconfig

Modified: head/usr.sbin/bsdinstall/scripts/netconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/netconfig	Sat Jun  4 11:56:20 2011	(r222680)
+++ head/usr.sbin/bsdinstall/scripts/netconfig	Sat Jun  4 12:51:22 2011	(r222681)
@@ -173,8 +173,7 @@ exec 3>&-
 echo ${RESOLV} | tr ' ' '\n' | \
 awk '
 BEGIN {
-	search=1
-	printf "search ";
+	search=-1;
 }
 {
 	if (/^[[:space:]]+$/) {
@@ -185,8 +184,13 @@ BEGIN {
 		search=0;
 		next;
 	}
+	if (search == -1) {
+		printf "search ";
+		search=1;
+	}
 	if (search > 0) {
-		printf "%s%s", (search > 1) ? "," : "", $1;
+		printf "%s%s", (search > 1) ? " " : "", $1;
+		search++;
 		next;
 	}
 	printf "nameserver %s\n", $1;