From owner-freebsd-current@FreeBSD.ORG Mon Sep 28 15:24:30 2009 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAB3A106566B for ; Mon, 28 Sep 2009 15:24:30 +0000 (UTC) (envelope-from serenity@exscape.org) Received: from ch-smtp01.sth.basefarm.net (ch-smtp01.sth.basefarm.net [80.76.149.212]) by mx1.freebsd.org (Postfix) with ESMTP id 776FE8FC20 for ; Mon, 28 Sep 2009 15:24:30 +0000 (UTC) Received: from c83-253-248-99.bredband.comhem.se ([83.253.248.99]:57142 helo=mx.exscape.org) by ch-smtp01.sth.basefarm.net with esmtp (Exim 4.68) (envelope-from ) id 1MsI4b-00088a-4P; Mon, 28 Sep 2009 17:23:35 +0200 Received: from [192.168.1.5] (macbookpro [192.168.1.5]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mx.exscape.org (Postfix) with ESMTPSA id 590DD1CF69B; Mon, 28 Sep 2009 17:23:25 +0200 (CEST) Mime-Version: 1.0 (Apple Message framework v1076) Content-Type: text/plain; charset=iso-8859-1; format=flowed; delsp=yes From: Thomas Backman In-Reply-To: <86eipr3zbt.fsf@ds4.des.no> Date: Mon, 28 Sep 2009 17:23:22 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <3F62B9F0-C64F-4262-B654-6F7028AEF03B@exscape.org> References: <86eipr3zbt.fsf@ds4.des.no> To: =?iso-8859-1?Q?Dag-Erling_Sm=F8rgrav?= X-Mailer: Apple Mail (2.1076) X-Originating-IP: 83.253.248.99 X-Scan-Result: No virus found in message 1MsI4b-00088a-4P. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1MsI4b-00088a-4P 01e309808045e608443e7548c409b598 Cc: Alexander Best , freebsd-current@FreeBSD.org, Andriy Gapon Subject: Re: ipv6 related warnings X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 15:24:31 -0000 On Sep 28, 2009, at 4:42 PM, Dag-Erling Sm=F8rgrav wrote: > Alexander Best writes: >> mergemaster -p and mergemaster -i aren't sufficient to sync /etc with >> /usr/src/etc? > > If I remember the meaning of -i correctly, then no. > > 1) what do the following commands say? > > ident /etc/defaults/rc.conf > ident /etc/network.subr > ident /etc/rc.d/netif > > 2) do you have an /etc/rc.d/network_ipv6? Sorry for barging in here, but I use mergemaster -i (actually -iUF, if =20= that makes a difference towards being sufficient), and figured more =20 results won't hurt: /etc/defaults/rc.conf: $FreeBSD: stable/8/etc/defaults/rc.conf 197065 2009-09-10 =20 14:04:00Z kensmith $ /etc/network.subr: $FreeBSD: stable/8/etc/network.subr 196645 2009-08-29 19:45:03Z =20= dougb $ /etc/rc.d/netif: $FreeBSD: stable/8/etc/rc.d/netif 195026 2009-06-26 01:04:50Z =20 dougb $ netif has a newer revision in SVN, *but* only the ident line has =20 changed = (http://svn.freebsd.org/viewvc/base/stable/8/etc/rc.d/netif?r1=3D195026&r2= =3D196045=20 ), so I don't see how it matters. I also do have network_ipv6. BTW, mergemaster's man page says this about my options: -i Automatically install any files that do not exist in =20= the destination directory. -F If the files differ only by VCS Id ($FreeBSD) =20 install the new file. -U Attempt to auto upgrade files that have not been =20 user modified. Regards, Thomas PS. Latest installworld Sept 24th. DS.