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 _______________________________________________ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
