From nobody Mon Oct 21 15:47:41 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 4XXKSt36ygz5ZRXy for ; Mon, 21 Oct 2024 15:47:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXKSs5c12z4v2c for ; Mon, 21 Oct 2024 15:47:41 +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=1729525661; 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=q3ASXQzTFQp1Zcj5awd+s7nD36cLdWJReWk9ER4R3vw=; b=JCozvrcroHn+tHdJE5Uz6jrdS2UCVxF9ISznBNbjG2hrn9fxwJyIER/SaUSdh9Oeh03zp8 xAX4iXQDgPT9EjAXX/QejSlz/rBP/RDbGGowrxegrHn9pU9Rk2I0hfSAwHvuAz/+Dv6KH1 C9JDkbJRnQ80oZdvidfiZi+5v8wxrqMFZWc4InKKbE6OFYuesCuxmLVNDQAZm+GVYesCDP GUTRCRyrfaYndbL102yZggntMGwJ4KiQCACzRroKkcqlV+M4lBzh7sqURQ4WNfUAVFJ317 rSZqr5HpWQRq6P9GfsOoyNnCPuXdE6iOPO/109LAMZr02wW1Mh4GDTnLZXRpjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525661; a=rsa-sha256; cv=none; b=AaIeUfXVSeurUnoZYjfHA3dETQnN6h2M4ZtIA/A3ybEqmxbLJt+J7ogMUPT9OfXnwjOjMP ILUBzeBLxefrEr01nPRGAEzRj+C8jwGIxHH6tWsN9W2X7bUIHlgogaFtnyrCYHH9+hvJLX YOJCY4/lwTS9ZYLe4fZghyNslKldaWhdmYWpb0t9PSpf/U1oqDqktVyYGMnD68rut91PW3 mAlQdow9OE398pp8Q7/yTDoqKad2KKsD8d/UuJGfRapkWmGrkxqb+e2szkHWpAoNipQ4OU 5HwwZJZQTVksJFJ4qY62ZMdK3NoPt2nVSNXjPl4x1l8DZDcO+jwkJgul86vnOw== 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 4XXKSs59GbzbWP for ; Mon, 21 Oct 2024 15:47:41 +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 49LFlfV2074441 for ; Mon, 21 Oct 2024 15:47:41 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 49LFlfDs074440 for doc@FreeBSD.org; Mon, 21 Oct 2024 15:47:41 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: Mon, 21 Oct 2024 15:47:41 +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: imp@FreeBSD.org X-Bugzilla-Flags: mfc-stable14? mfc-stable13? X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: 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 List-Archive: https://lists.freebsd.org/archives/freebsd-doc List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-doc@FreeBSD.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D204549 --- Comment #15 from commit-hook@FreeBSD.org --- A commit in branch stable/14 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3D85f889aa9cdad831a68b42050d1adb47d= 4eb960d commit 85f889aa9cdad831a68b42050d1adb47d4eb960d Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:46:41 +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 (cherry picked from commit a8c1ffca7a594733a91c1513d0185be174d1115f) 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.=