xnHEVA6+O15QMHfBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762783619; a=rsa-sha256; cv=none; b=BGIvkdTT9WTKj4Ix2laUxxNlq1AvB1s+GvM9n+NotcZmd2c8SCM9jo5yuE/TrfxxmSILAb qTKVMrt4LavrhvYTZ7UWtG8HoEK7WiSMBkCkUHHxexEeUhCGnWj1N1KVlG51p1RJFHqGbD R3mHcTR+VpqCtdYw0WOh7kr4S8L4m1kMwIiCwfG6O9asa/RD/lxgbvPDKhz5kTiekp2Xpa BUClB2ger0l2k3FVzsgi90gaFIyD9LYwFAtJpj3UUY6JQT3TpHME7ZeiMOUBc8lcUaa8dd SN7GgCL6JVPtTEt6829eL8ZzefkO2nsp+Zhs87gXyJcMrudA8Znh7UDvaj6r1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d4s0y64rxz5qx for ; Mon, 10 Nov 2025 14:06:58 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 5AAE6wZh011693 for ; Mon, 10 Nov 2025 14:06:58 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 5AAE6wdX011692 for bugs@FreeBSD.org; Mon, 10 Nov 2025 14:06:58 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 290927] etcupdate(8) failing to update etc Date: Mon, 10 Nov 2025 14:06:59 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: 15.0-STABLE X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: zarychtam@plan-b.pwste.edu.pl X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter Message-ID: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@FreeBSD.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D290927 Bug ID: 290927 Summary: etcupdate(8) failing to update etc Product: Base System Version: 15.0-STABLE Hardware: Any OS: Any Status: New Severity: Affects Only Me Priority: --- Component: bin Assignee: bugs@FreeBSD.org Reporter: zarychtam@plan-b.pwste.edu.pl After transitioning from stable/14 to stable/15 mergemaster was replaced by etcupdate. It had run successfully a few times, but now it's complaining ea= ch run in the same way on the same file: # etcupdate -B M /etc/blacklistd.conf PANIC: merge failed with status 2 The file is fine: # ll -o /etc/blacklistd.conf -rw-r--r-- 1 root wheel uarch 642 Nov 10 14:53 /etc/blacklistd.conf Removing it doesn't help. Should I deal with the files inside /var/db/etcup= date to push it forward? On the other hand, it looks like etcpudate did the job fine, and it's complaining only on exit.=20 I believe it's worth reporting, since some people want etcupdate to be work= ing flawlessly. BTW, mergermaster(8) never had such problems. Let me also cite our former committer, since I value his advice highly: 20:34 < dillon> ha. The first thing I did when I started the DragonFly pro= ject was completely scrap all the 3-way merge junk that turns perfectly working machines into flaming disasters --=20 You are receiving this mail because: You are the assignee for the bug.=