Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jan 2009 09:13:39 +0300
From:      Yuri Pankov <yuri.pankov@gmail.com>
To:        Peter Boosten <peter@boosten.org>
Cc:        freebsd-questions@freebsd.org, Johann Hasselbach <jhass88@gmail.com>
Subject:   Re: mergemaster goof when src upgrading 7.0 -> 7.1
Message-ID:  <20090107061339.GB12584@darklight.homeunix.org>
In-Reply-To: <4964467D.9020606@boosten.org>
References:  <ab52c4f40901061328i254481d9obb36bcf53757d7db@mail.gmail.com> <4964467D.9020606@boosten.org>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote:
> Johann Hasselbach wrote:
> > I was doing a src upgrade from 7.0 to 7.1
> > 
> > After installkernel, i rebooted, and accidently ran "mergemaster"
> > instead of "mergemaster -p" before installworld. I ctrl-c'd once I
> > realized what I had done, but the damage was done.
> > 
> > It seems to have overwritten my password and group files.
> > 
> 
> I've stated this before: In my opinion this entire 'I want to overwrite
> your passwd file' attitude from mergemaster is nonsense: at installation
> time you're required to add an additional user, and mergemaster wants to
> undo that again.
> 
> There are other ways to create new accounts or groups than simply
> overwriting passwd/group files.
> 
> Also: most scripts updated by mergemaster during 7.0->7.1 are only
> version numbering diffs. Is there no smarter way to do this, apart from
> typing 'i' every time?

I think you want -U option (auto upgrade files that have not been
modified by user) along with -i (install missing files).

> 
> Having to go through mergemaster is the most tedious job I've ever done
> (it would probably be bearable if only one machine was involved).
> 
> > 
> > Did I damage anything else?
> 
> You might wanna look at hosts, login.conf, ssh config, pam, audit,
> sendmail, syslog.conf, basically everything in /etc.
> 
> Peter
> 
> -- 
> http://www.boosten.org


Yuri



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?20090107061339.GB12584>