On Sep 28, 2009, at 4:42 PM, Dag-Erling Smørgrav wrote: > Alexander Best <alexbestms_at_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 that makes a difference towards being sufficient), and figured more results won't hurt: /etc/defaults/rc.conf: $FreeBSD: stable/8/etc/defaults/rc.conf 197065 2009-09-10 14:04:00Z kensmith $ /etc/network.subr: $FreeBSD: stable/8/etc/network.subr 196645 2009-08-29 19:45:03Z dougb $ /etc/rc.d/netif: $FreeBSD: stable/8/etc/rc.d/netif 195026 2009-06-26 01:04:50Z dougb $ netif has a newer revision in SVN, *but* only the ident line has changed (http://svn.freebsd.org/viewvc/base/stable/8/etc/rc.d/netif?r1=195026&r2=196045 ), 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 the destination directory. -F If the files differ only by VCS Id ($FreeBSD) install the new file. -U Attempt to auto upgrade files that have not been user modified. Regards, Thomas PS. Latest installworld Sept 24th. DS.Received on Mon Sep 28 2009 - 13:24:30 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:56 UTC