From owner-svn-src-head@FreeBSD.ORG  Mon Sep 23 17:35:23 2013
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8EDC1D31;
 Mon, 23 Sep 2013 17:35:23 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7C65F2CF1;
 Mon, 23 Sep 2013 17:35:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NHZNtt052080;
 Mon, 23 Sep 2013 17:35:23 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8NHZNhd052079;
 Mon, 23 Sep 2013 17:35:23 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201309231735.r8NHZNhd052079@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 23 Sep 2013 17:35:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255819 - head/usr.sbin/unbound/local-setup
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Mon, 23 Sep 2013 17:35:23 -0000

Author: des
Date: Mon Sep 23 17:35:23 2013
New Revision: 255819
URL: http://svnweb.freebsd.org/changeset/base/255819

Log:
  Ensure that resolvconf(8) preserves the edns0 setting.
  
  Approved by:	re (blanket)

Modified:
  head/usr.sbin/unbound/local-setup/local-unbound-setup.sh

Modified: head/usr.sbin/unbound/local-setup/local-unbound-setup.sh
==============================================================================
--- head/usr.sbin/unbound/local-setup/local-unbound-setup.sh	Mon Sep 23 16:47:52 2013	(r255818)
+++ head/usr.sbin/unbound/local-setup/local-unbound-setup.sh	Mon Sep 23 17:35:23 2013	(r255819)
@@ -157,6 +157,7 @@ gen_resolv_conf() {
 gen_resolvconf_conf() {
 	echo "# Generated by $self"
 	echo "name_servers=\"127.0.0.1\""
+	echo "resolv_conf_options=\"edns0\""
 	echo "unbound_conf=\"${forward_conf}\""
 	echo "unbound_pid=\"${pidfile}\""
 	echo "unbound_service=\"${service}\""