From owner-svn-src-head@FreeBSD.ORG  Mon Jun  6 11:36:10 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 E97841065670;
	Mon,  6 Jun 2011 11:36:10 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D9DA88FC17;
	Mon,  6 Jun 2011 11:36:10 +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 p56BaAgc029318;
	Mon, 6 Jun 2011 11:36:10 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p56BaAX0029316;
	Mon, 6 Jun 2011 11:36:10 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106061136.p56BaAX0029316@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 6 Jun 2011 11:36:10 +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: r222746 - head/etc
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: Mon, 06 Jun 2011 11:36:11 -0000

Author: hrs
Date: Mon Jun  6 11:36:10 2011
New Revision: 222746
URL: http://svn.freebsd.org/changeset/base/222746

Log:
  Do not mark lo0 as IFDISABLED even if there is no $ifconfig_lo0_ipv6 line.

Modified:
  head/etc/network.subr

Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr	Mon Jun  6 11:10:38 2011	(r222745)
+++ head/etc/network.subr	Mon Jun  6 11:36:10 2011	(r222746)
@@ -102,7 +102,7 @@ ifconfig_up()
 	if afexists inet6; then
 		if checkyesno ipv6_activate_all_interfaces; then
 			_ipv6_opts="-ifdisabled"
-		else
+		elif [ "$1" != "lo0" ]; then
 			_ipv6_opts="ifdisabled"
 		fi