From nobody Fri Feb 2 20:39:38 2024
X-Original-To: doc@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRSLh20GYz58DSL
for <doc@mlmmj.nyi.freebsd.org>; Fri, 2 Feb 2024 20:39:40 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(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-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4TRSLh0zcvz519s
for <doc@FreeBSD.org>; Fri, 2 Feb 2024 20:39:40 +0000 (UTC)
(envelope-from bugzilla-noreply@freebsd.org)
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1706906380;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=vYdi+f3EV+dvCC+h17OP/JdUZmlT7zY/T3P9LBek/6A=;
b=wLDROdN4cPQzCsuDu7f4fjr3VdygwDcfVtBXtaINPQZwiBXF6heNoEZqb6zy51sac4X61V
1C19KGq9TNDkoKhl18NeIwnMdj6Mlk3gml2M4zbaQgOw3YYIYmPqgG4UYF4DYyHUfvuzpV
rhgdtfcMazS4eDmqbjd+p7B0DEMOuVayoBCE2C6KuRi8SpJYOPihi44HtyswAlSNcBz7uc
hhtMk5OqHVWbuzZq44b9jaLGdFNB40SpTPbbQ1GVX7dJ2AOKZQHha/I4edt73mxW5S6KdD
dgdTrYiHPOlpE+hty2KAIruskkk4vCbJHQDQkLSrUXBJKfCs+IoHt2co83Jmgw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706906380; a=rsa-sha256; cv=none;
b=vYOND4dcT4Mqiu+f/UGPpgvGerCWlcPQeFJDZrr3Zp+gm1wOu4TtfeFwKDMc7VUkO2d3M0
o4KRU0D8kCyhWGgM90sTS0RMoaJ0y+KkEJDs7x2OiRkIDd238q5qGW5tjgifNNvXqVNMXE
4PjienWSDsRsX3IT9R9nA+eoBHz0aky/CUFJDTgasArcwpe3qEjilyateSyfvLTh3LWprM
u4aZSzxOmxQKg0cwbipMXee63DB0xZkf2gfEHzteJJq1mktrBOlRgbBTlTVHJa6rDDvCiu
hu7PN6pE32XRG7UAOaMXQ7EX0lDjU3rjGDVtGzzDLjcDAXM6MLbBT0IEKaknfg==
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 4TRSLh01krzlhT
for <doc@FreeBSD.org>; Fri, 2 Feb 2024 20:39:40 +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 412KddGv024938
for <doc@FreeBSD.org>; Fri, 2 Feb 2024 20:39:39 GMT
(envelope-from bugzilla-noreply@freebsd.org)
Received: (from bugzilla@localhost)
by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 412KddHk024937
for doc@FreeBSD.org; Fri, 2 Feb 2024 20:39:39 GMT
(envelope-from bugzilla-noreply@freebsd.org)
X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f
From: bugzilla-noreply@freebsd.org
To: doc@FreeBSD.org
Subject: [Bug 204549] freebsd-update should fetch e.g. /etc/ntp.conf.default
Date: Fri, 02 Feb 2024 20:39:38 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: Base System
X-Bugzilla-Component: conf
X-Bugzilla-Version: 9.3-RELEASE
X-Bugzilla-Keywords:
X-Bugzilla-Severity: Affects Many People
X-Bugzilla-Who: commit-hook@FreeBSD.org
X-Bugzilla-Status: New
X-Bugzilla-Resolution:
X-Bugzilla-Priority: ---
X-Bugzilla-Assigned-To: bugs@FreeBSD.org
X-Bugzilla-Flags:
X-Bugzilla-Changed-Fields:
Message-ID: <bug-204549-9-dRsG6yOuRd@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-204549-9@https.bugs.freebsd.org/bugzilla/>
References: <bug-204549-9@https.bugs.freebsd.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/
Auto-Submitted: auto-generated
List-Id: Documentation project <freebsd-doc.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-doc
List-Help: <mailto:freebsd-doc+help@freebsd.org>
List-Post: <mailto:freebsd-doc@freebsd.org>
List-Subscribe: <mailto:freebsd-doc+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-doc+unsubscribe@freebsd.org>
Sender: owner-freebsd-doc@freebsd.org
MIME-Version: 1.0
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D204549
--- Comment #12 from commit-hook@FreeBSD.org ---
A commit in branch main references this bug:
URL:
https://cgit.FreeBSD.org/src/commit/?id=3Da8c1ffca7a594733a91c1513d0185be17=
4d1115f
commit a8c1ffca7a594733a91c1513d0185be174d1115f
Author: Graham Perrin <grahamperrin@gmail.com>
AuthorDate: 2023-08-19 14:52:18 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-02-02 20:35:25 +0000
freebsd-update(8): Explain conflicts in /etc
Unlike etcupdate(8), freebsd-update only prints the files with
conflicts. It doesn't merge.
PR: 204549
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/826
usr.sbin/freebsd-update/freebsd-update.8 | 9 +++++++++
1 file changed, 9 insertions(+)
--=20
You are receiving this mail because:
You are on the CC list for the bug.=