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 added to the
 passwd/group
  file *without* deleting the others.
 
 
  mergemaster doesn't delete ALL accounts if you do it correctly. I usually
  leave the files for later and then manually do it.
 

 Your 'do it correctly' refers to 'leave it for later', however I've read
 at least twice yesterday, that someone *accidentally* 'installed' the
 file from /var/tmp/temproot. *That* should not be possible in the first
 place.

 Thank heaven it never happened to me (knock on wood), but a mistake is
 easily made, especially when you just went through a whole bunch of
 updated rc scripts.

 Peter

 --
 http://www.boosten.org


myself I just watch the file name line since I don't touch files outside of
/usr. unless it's for example ppp.conf
___
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


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 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.
 
Well...i'm not developper but long time ago, when I update from FreeBSD x.y
to Freebsd x+1,(0-1) I loose many time to find something don't work because
the Freebsd x+1 need some new system account. 

Regards.
-- 
Albert SHIH
SIO batiment 15
Observatoire de Paris Meudon
5 Place Jules Janssen
92195 Meudon Cedex
Téléphone : 01 45 07 76 26
Heure local/Local time:
Mer 7 jan 2009 21:20:36 CET
___
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


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 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.


Well...i'm not developper but long time ago, when I update from FreeBSD x.y
to Freebsd x+1,(0-1) I loose many time to find something don't work because
the Freebsd x+1 need some new system account. 



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.


Peter
--
http://www.boosten.org
___
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


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 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.

  Well...i'm not developper but long time ago, when I update from FreeBSD
 x.y
 to Freebsd x+1,(0-1) I loose many time to find something don't work
 because
 the Freebsd x+1 need some new system account.


 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.

 Peter
 --
 http://www.boosten.org
 ___
 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


mergemaster doesn't delete ALL accounts if you do it correctly. I usually
leave the files for later and then manually do it.
___
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

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 doesn't delete ALL accounts if you do it correctly. I usually
 leave the files for later and then manually do it.
 

Your 'do it correctly' refers to 'leave it for later', however I've read
at least twice yesterday, that someone *accidentally* 'installed' the
file from /var/tmp/temproot. *That* should not be possible in the first
place.

Thank heaven it never happened to me (knock on wood), but a mistake is
easily made, especially when you just went through a whole bunch of
updated rc scripts.

Peter

-- 
http://www.boosten.org
___
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


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 copied groups, passwd, master.passwd, pwd.db, and
spwd.db from a recent backup and everything looks okay now.

Did I damage anything else?
___
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


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 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?

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
___
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


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, 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


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 (install missing files).

How does it deteremine what's been user-modified?  I've got a
few things that have local edits that, for reasons of laziness,
still have the same version tag. 


Robert Huff
___
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


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 that have not been
 modified by user) along with -i (install missing files).

After reading the man page the -s option seems to be more appropriate
(unless I misread that bit, of course :-) ).

Peter

-- 
http://www.boosten.org
___
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