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

2015-03-12 Thread Peter Olsson
On Tue, Mar 10, 2015 at 12:55:09PM -0500, Adam Vande More wrote: On Tue, Mar 10, 2015 at 12:45 PM, Peter Olsson list-freebsd-sta...@jyborn.se wrote: On Tue, Mar 10, 2015 at 10:17:18AM -0500, Adam Vande More wrote: On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson

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

2015-03-12 Thread Chris H
On Tue, 10 Mar 2015 14:08:21 -0500 Adam Vande More amvandem...@gmail.com wrote On Tue, Mar 10, 2015 at 2:01 PM, Chris H bsd-li...@bsdforge.com wrote: https://svnweb.freebsd.org/base?view=revisionrevision=221780 I'd venture to guess the script will work fine on older installs,

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

2015-03-12 Thread John Baldwin
On Wednesday, March 11, 2015 10:19:33 AM Peter Olsson wrote: On Tue, Mar 10, 2015 at 10:06:37PM +, Ben Morrow wrote: Quoth Peter Olsson list-freebsd-sta...@jyborn.se: (But I will try running freebsd-update without merging /etc, and use mergemaster -F instead. Should solve my

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

2015-03-11 Thread Peter Olsson
On Tue, Mar 10, 2015 at 10:06:37PM +, Ben Morrow wrote: Quoth Peter Olsson list-freebsd-sta...@jyborn.se: (But I will try running freebsd-update without merging /etc, and use mergemaster -F instead. Should solve my problem.) I'm fairly sure this won't do what you want, and in fact

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

2015-03-10 Thread Peter Olsson
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? I just did my first

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

2015-03-10 Thread Tom Evans
On Tue, Mar 10, 2015 at 1:58 PM, Chris H bsd-li...@bsdforge.com wrote: 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

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

2015-03-10 Thread Chris H
On Tue, 10 Mar 2015 13:05:40 +0100 Peter Olsson list-freebsd-sta...@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)

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

2015-03-10 Thread Kurt Jaeger
Hi! 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? I just

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

2015-03-10 Thread Miroslav Lachman
Peter Olsson wrote on 03/10/2015 13:05: [...] (I amused myself by counting all files during this stage. I had to answer y to about 320 files, most of which only had changes in the ID.) This was my first upgrade from 8.4 to 9.3. I have 30 more to go before the 8.4 EoL this summer. I see 30

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

2015-03-10 Thread Peter Olsson
On Tue, Mar 10, 2015 at 10:17:18AM -0500, Adam Vande More wrote: On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson list-freebsd-sta...@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:

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

2015-03-10 Thread Peter Olsson
On Tue, Mar 10, 2015 at 06:58:07AM -0700, Chris H wrote: On Tue, 10 Mar 2015 13:05:40 +0100 Peter Olsson list-freebsd-sta...@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

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

2015-03-10 Thread Adam Vande More
On Tue, Mar 10, 2015 at 12:45 PM, Peter Olsson list-freebsd-sta...@jyborn.se wrote: On Tue, Mar 10, 2015 at 10:17:18AM -0500, Adam Vande More wrote: On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson list-freebsd-sta...@jyborn.se wrote: This flag to mergemaster saved a lot of work when I

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

2015-03-10 Thread Miroslav Lachman
Don Lewis wrote on 03/11/2015 02:05: On 10 Mar, Miroslav Lachman wrote: This and some other problems with freebsd-update (hanging on the reboot after update) turns me back to using source compiled upgrades. I am compiling 10.1 right now to do the upgrades from 8.4 to 10.1 on 15 machines. I

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

2015-03-10 Thread Don Lewis
On 10 Mar, Miroslav Lachman wrote: This and some other problems with freebsd-update (hanging on the reboot after update) turns me back to using source compiled upgrades. I am compiling 10.1 right now to do the upgrades from 8.4 to 10.1 on 15 machines. I only do source upgrades, but I've

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

2015-03-10 Thread Adam Vande More
On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson list-freebsd-sta...@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: https://svnweb.freebsd.org/base?view=revisionrevision=221780 I'd venture to

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

2015-03-10 Thread Chris H
On Tue, 10 Mar 2015 06:58:07 -0700 Chris H bsd-li...@bsdforge.com wrote On Tue, 10 Mar 2015 13:05:40 +0100 Peter Olsson list-freebsd-sta...@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:

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

2015-03-10 Thread Chris H
On Tue, 10 Mar 2015 10:17:18 -0500 Adam Vande More amvandem...@gmail.com wrote On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson list-freebsd-sta...@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

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

2015-03-10 Thread Adam Vande More
On Tue, Mar 10, 2015 at 2:01 PM, Chris H bsd-li...@bsdforge.com wrote: https://svnweb.freebsd.org/base?view=revisionrevision=221780 I'd venture to guess the script will work fine on older installs, but testing should be done first. Isn't that pretty much what the -F flag, I

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

2015-03-10 Thread Peter Olsson
On Tue, Mar 10, 2015 at 12:01:54PM -0700, Chris H wrote: On Tue, 10 Mar 2015 10:17:18 -0500 Adam Vande More amvandem...@gmail.com wrote On Tue, Mar 10, 2015 at 7:05 AM, Peter Olsson list-freebsd-sta...@jyborn.se wrote: This flag to mergemaster saved a lot of work when I did

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

2015-03-10 Thread Ben Morrow
Quoth Peter Olsson list-freebsd-sta...@jyborn.se: (But I will try running freebsd-update without merging /etc, and use mergemaster -F instead. Should solve my problem.) I'm fairly sure this won't do what you want, and in fact won't work at all, unless your /etc is identical to the stock /etc