From nobody Mon Oct 21 15:49:43 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 4XXKWD2Ts7z5ZRYg for ; Mon, 21 Oct 2024 15:49:44 +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 4XXKWD0Mfjz4vrM for ; Mon, 21 Oct 2024 15:49:44 +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=1729525784; 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=xu4FbPa399AODTSRq+Cy5f7/XEg/zHwQZUop6Q98TzY=; b=vjvHHPq/OMb7uxlnpeVzj5EBvYWG1VxHj+W60eli8wZNtyDYxWBfuhiRSKRhlcc9btfQFO gEW2Nmc4emwSpi/mhyBfY0itGZIculB5zw+ST1CH1q6V1FXhuINoFkLl8y5TKyqyqO4eBC Ip97h+tif1rS3HyqQBfAOP3AieO1LrvxTlpLxx2gReCVf1+Fe31TdOJEj1wBgg88sCFyx0 X4Ln7r/zwzpUmD8ri3z0M1iUDtG6n6ocL5+JUQDATTVMlYPAx1F2HBFPvlN4+GSacbb1dY E19kXdW7QIxRiOia8nj1VaZZa5brIwrQYRdV2diBAR2UPShOREj4TzckX70Vmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729525784; a=rsa-sha256; cv=none; b=NYD5PLMN3kv1sQfXNk44Jj+jWEq1FCt4nNhQu2zBwtl8k/CstLALoWJxYCokmkMdTmxol5 CEPrIHO6nJnfl1cLVIMHfUh3/1Bq1+cGTuVK/QcdvxU7ZVmsSLTqJM44fHWIxFDa5bWA8T jeAPuI7WDfo7H7Z+Z87tMk4cyzPLc//afiU2mT/LMyi3wo5/JN8UtkNDjmqgu2tEx9KPkN ngS4M8mn8FACxCnPotLw6b90zLpnQlq62Dh8T0WFs+YFOcD/yFr56mnoTaFROBW/rD/Md/ yHKmbH3blQTZEoNpvhrW15++GKWdvpwtnx0IcTexYz0DbLQkEwubGJ85+azbaw== 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 4XXKWC6VckzcSY for ; Mon, 21 Oct 2024 15:49:43 +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 49LFnhWF075560 for ; Mon, 21 Oct 2024 15:49:43 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 49LFnhWb075559 for doc@FreeBSD.org; Mon, 21 Oct 2024 15:49:43 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:49:43 +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 #16 from commit-hook@FreeBSD.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3Db9c3f49fac756f98555c516b54b680c62= 5becb61 commit b9c3f49fac756f98555c516b54b680c625becb61 Author: Graham Perrin AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Ed Maste CommitDate: 2024-10-21 15:48:45 +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) (cherry picked from commit 85f889aa9cdad831a68b42050d1adb47d4eb960d) 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.=