Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-08 Thread matt donovan
On Wed, Jan 7, 2009 at 10:55 PM, Peter Boosten pe...@boosten.org wrote: matt donovan wrote: On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten pe...@boosten.org wrote: Well, my point is that mergemaster shouldn't have to delete ALL accounts, just to add one. User and group accounts can be

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-07 Thread Albert Shih
Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit 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

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-07 Thread Peter Boosten
Albert Shih wrote: Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit 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

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-07 Thread matt donovan
On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten pe...@boosten.org wrote: Albert Shih wrote: Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit 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

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-07 Thread Peter Boosten
matt donovan wrote: On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten pe...@boosten.org wrote: Well, my point is that mergemaster shouldn't have to delete ALL accounts, just to add one. User and group accounts can be added to the passwd/group file *without* deleting the others. mergemaster

mergemaster goof when src upgrading 7.0 - 7.1

2009-01-06 Thread Johann Hasselbach
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 successfully

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-06 Thread Peter Boosten
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

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-06 Thread Yuri Pankov
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,

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-06 Thread Robert Huff
Yuri Pankov writes: 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

Re: mergemaster goof when src upgrading 7.0 - 7.1

2009-01-06 Thread Peter Boosten
Yuri Pankov wrote: On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote: 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