Date: Mon, 28 Sep 2009 17:23:22 +0200 From: Thomas Backman <serenity@exscape.org> To: =?iso-8859-1?Q?Dag-Erling_Sm=F8rgrav?= <des@des.no> Cc: Alexander Best <alexbestms@math.uni-muenster.de>, freebsd-current@FreeBSD.org, Andriy Gapon <avg@icyb.net.ua> Subject: Re: ipv6 related warnings Message-ID: <3F62B9F0-C64F-4262-B654-6F7028AEF03B@exscape.org> In-Reply-To: <86eipr3zbt.fsf@ds4.des.no> References: <permail-20090928132402f7e55a9d0000034f-a_best01@message-id.uni-muenster.de> <86eipr3zbt.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sep 28, 2009, at 4:42 PM, Dag-Erling Sm=F8rgrav wrote:
> Alexander Best <alexbestms@math.uni-muenster.de> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F62B9F0-C64F-4262-B654-6F7028AEF03B>