i386/83572: mergemaster deletes users when upgrading 5.4 -> 6.0

[Jeff Shimbo]

>Number:         83572
>Category:       i386
>Synopsis:       mergemaster deletes users when upgrading 5.4 -> 6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-i386
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 16 20:50:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jeff Shimbo
>Release:        6.0 Beta1
>Organization:
>Environment:
CVSUPed 7/16. Also happened a week or two ago.
>Description:
When upgrading from 5.4 to 6.0 via CVSUP - makeworld/kernel - installkernel/world, mergemaster deletes non-system users from passwd (e.g., removes users mysql and me) and removes non-system users from some groups, e.g., group wheel.

If this is by design, there are two problems:

- Deviation from "90% behavior," i.e., most of the time you are upgrading within subversions, e.g., 5.4a -> 5.4b, and the problem does not occur.

- No warning in UPDATING.
>How-To-Repeat:
1. Install RELENG_5
2. CVSUP RELENG_6
3. Upgrade the world per the Handbook, section 19.4.1
4. Scrutinize changes to passwd and group in mergermaster step
>Fix:
Request:
- Warn user in UPDATING
- Be more selective about changes to passwd and group files
>Release-Note:
>Audit-Trail:
>Unformatted: