There has to be a better way of merging /etc during a major freebsd-update

Chris H bsd-lists at bsdforge.com
Tue Mar 10 14:46:46 UTC 2015


On Tue, 10 Mar 2015 06:58:07 -0700 "Chris H" <bsd-lists at bsdforge.com> wrote

> On Tue, 10 Mar 2015 13:05:40 +0100 Peter Olsson
> <list-freebsd-stable at jyborn.se> wrote
> 
> > This flag to mergemaster saved a lot of work when I did
> > upgrades the old way, with cvsup and the make steps and
> > then mergemaster:
> > "
> > # Install the new file if it differs only by VCS Id ($FreeBSD)
> > FREEBSD_ID=yes
> > "
> > Is there some equivalent to this flag in freebsd-update/merge?
> Hello, Peter.
> This has probably been answered by now. But just in case.
> I believe what you're looking for is:
> mergemaster -vF
> 
> This is my [chosen] default. I also find it helpful,
> as a "safety net" to
> cp _Rp /etc /eetc
Ahem... On the off chance it wasn't obvious.
The above line /should/ have read
cp -Rp /etc /eetc
___^

Sorry.

--Chris
> 
> prior to the mergemaster(8) step.
> 
> On a related note. I'm not very fond of mergemaster. As
> a result, I recently took on maintaining
> sysutils/etcmerge. sysutils/etcupdate, is also a
> [mergemaster] related port.
> 
> Hope this helps.
> 
> --Chris
> > 
> > I just did my first major upgrade (8.4-RELEASE-p24 ->
> > 9.3-RELEASE-p10) with freebsd-update. It took more than
..
> > 
> > -- 
> > Peter Olsson
> > _______________________________________________
> > freebsd-stable at freebsd.org mailing list
> > http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> > To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
> 
> 
> _______________________________________________
> freebsd-stable at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"




More information about the freebsd-stable mailing list