From owner-cvs-all@FreeBSD.ORG  Tue Oct 10 12:41:06 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 25D4616A407;
	Tue, 10 Oct 2006 12:41:06 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E78F743D49;
	Tue, 10 Oct 2006 12:41:05 +0000 (GMT) (envelope-from ume@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9ACf5er035866;
	Tue, 10 Oct 2006 12:41:05 GMT (envelope-from ume@repoman.freebsd.org)
Received: (from ume@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ACf5Nr035862;
	Tue, 10 Oct 2006 12:41:05 GMT (envelope-from ume)
Message-Id: <200610101241.k9ACf5Nr035862@repoman.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Tue, 10 Oct 2006 12:41:05 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/etc network.subr src/etc/rc.d Makefile
 auto_linklocal
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Oct 2006 12:41:06 -0000

ume         2006-10-10 12:41:05 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    etc                  network.subr 
    etc/rc.d             Makefile 
  Added files:           (Branch: RELENG_6)
    etc/rc.d             auto_linklocal 
  Log:
  MFC: Restore the behavior that net.inet6.ip6.auto_linklocal=0 could
  be coexist with ipv6_enable="YES".
  
          etc/network.subr:               1.175
          etc/rc.d/Makefile:              1.77
          etc/rc.d/auto_linklocal:        1.1
  
  Approved by:    re (hrs)
  
  Revision   Changes    Path
  1.164.2.6  +0 -4      src/etc/network.subr
  1.53.2.13  +1 -1      src/etc/rc.d/Makefile
  1.1.2.1    +18 -0     src/etc/rc.d/auto_linklocal (new)