[Bug 280245] etcupdate unexpected conflicts and duplicit work after -p (pre-world)

From: <bugzilla-noreply_at_freebsd.org>
Date: Fri, 12 Jul 2024 18:44:33 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280245

            Bug ID: 280245
           Summary: etcupdate unexpected conflicts and duplicit work after
                    -p (pre-world)
           Product: Base System
           Version: 13.3-RELEASE
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: bin
          Assignee: bugs@FreeBSD.org
          Reporter: 000.fbsd@quip.cz

I've been trying to use etcupdate instead of mergemaster for a few years now,
but I'm unpleasantly surprised after almost every OS version upgrade. When an
upgrade needs to add a new UID or GID in the pre-world (etcupdate -p), it
basically always ends up with a conflict even in places where you are really
just adding a new entry and there is no conflict with any other entry on the
same place.

Moreover, if I fix such a conflict with "etcupdate resolve -p", install a new
system and run "etcupdate", I have to manually resolve the conflicts in
master.passwd and group again! I find this behavior very little user friendly.

For example why there is a conflict on the line adding u2f group?

<<<<<<< yours
wheel:*:0:root,jk,jam
||||||| original
# $FreeBSD$
#
wheel:*:0:root
=======
wheel:*:0:root
>>>>>>> new
daemon:*:1:
kmem:*:2:
sys:*:3:
tty:*:4:
operator:*:5:root
mail:*:6:postfix
bin:*:7:
news:*:8:
man:*:9:
games:*:13:
ftp:*:14:
staff:*:20:
sshd:*:22:
smmsp:*:25:
mailnull:*:26:
guest:*:31:
video:*:44:
realtime:*:47:
idletime:*:48:
bind:*:53:
unbound:*:59:
proxy:*:62:
authpf:*:63:
_pflogd:*:64:
_dhcp:*:65:
uucp:*:66:
dialer:*:68:
network:*:69:
audit:*:77:
www:*:80:
<<<<<<< original
=======
u2f:*:116:
>>>>>>> new
ntpd:*:123:
_ypldap:*:160:
hast:*:845:
tests:*:977:
nogroup:*:65533:
nobody:*:65534:
jk:*:1007:
mysql:*:88:
mrtg:*:279:
maildrop:*:126:
postfix:*:125:

(And why it must be resolved two times?)

I've already observed several problems with etcupdate and reported them to
bugzilla.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271315
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271287

I'd like to know who is in charge of etcupdate, who I can contact to help
resolve all these problems.
With the current state of the etcupdate it is almost always more manual work to
fix those issues than with the old mergemaster. If etcupdate is preferred tool
for updates of /etc/ I really would like to make it better.

-- 
You are receiving this mail because:
You are the assignee for the bug.