From nobody Fri Feb 2 20:39:38 2024 X-Original-To: bugs@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 4TRSLg0Xn5z58DVT for ; Fri, 2 Feb 2024 20:39:39 +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 4TRSLf5WF6z516l for ; Fri, 2 Feb 2024 20:39:38 +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=1706906378; 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=V2htHOe0d/z8DksROUuG86wPumBl/yMNUTdL/ISuL2M=; b=uX1zUfBM1sfntGni9cOfmOKo9HTPu1UKV8380nZgJHC/oIY0fb9hHEXyHl/FzlkDnFoerl SY6KnXbO357G7uLUX4HZ2XucSlUHP0fKwBWLa9hXV5jjbY12SmB3As1rHLb9idCE6NONIM 2rzBtkTbnxhdVy3wWn19bSAlhTAPD5pTczV3Gn4KtJDNpS1PgmA3d1OaZ3NF7l8qFFnqds PrGyU+9tuaAjpZE5BAd3pZ0cL74KhlCPww8QXL831B2LcLycLlSx1BZ9ANurgIDOtWaK2S glDC/WlnNhymiwnGnsjMgB2p2XRPc0hUkbPnglGjhj/ZP7EJSJOgBwBXbiU4GQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706906378; a=rsa-sha256; cv=none; b=tWUzUMxoWpptpC41qKUb0Y/HJN1BCAB2K/j17gj48vc7Uc/fN7giRdE8LXoxqclW5tnMyo PjHQnS4/5QPeBHqvh0M6ezBlFQ3jT5tJijE3cf6Q2s2vTttEXViGi98J4miJCWTuJDwhvD bl9ogwQcKg240kdqQ/gq4/QEAYztEVl4jTtPRWltUBJCmRW8tmbnQuT3vomoxOtHTVrDvY FxV9n89U73VfwqPR99M1ABaeeuXlxrnoajgsyY0S1Jg1HHdgLxQe4nArMKA8k4rBPZLBRF OLWNUdmNtNBaXoK10MKjvHBWv1C123lNM1BC5KYAhfjKnNy2nSoJ6/dzu3vhPQ== 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 4TRSLf4ZDBzlhS for ; Fri, 2 Feb 2024 20:39:38 +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 412KdcxY024861 for ; Fri, 2 Feb 2024 20:39:38 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 412KdcRe024860 for bugs@FreeBSD.org; Fri, 2 Feb 2024 20:39:38 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: bugs@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: AssignedTo 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: 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: 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=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 AuthorDate: 2023-08-19 14:52:18 +0000 Commit: Warner Losh 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 the assignee for the bug.=