From nobody Tue Sep 2 08:31:05 2025 X-Original-To: dev-commits-src-main@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 4cGJqF4gsZz66Fyy; Tue, 02 Sep 2025 08:31:05 +0000 (UTC) (envelope-from git@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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGJqF44Zwz41nq; Tue, 02 Sep 2025 08:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756801865; 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; bh=oPkVJYaSyvM0Onu1ezQKhod5x/DXNi7J7phCn18wf20=; b=bewAc84FLUBihdJARSqJBYsyktytPUpnjWoRkjgdRLv7V+6t3ZsX7apLCI8KbnRgftacIt aaxYWVioSIq9jpOitlk7KTIOF7Ggw/TucvP4ujZXc8QXzaId/nzEEfz2rmNeeWFGVGwk1V rqItyOSfpoQYQoydTL5kGpOibc/czWLl6kHQ9wmKEknYMZ9811Rbmm2ovyllAVAqlReOKc 4F7TME0a6eP3o2T49kfbAUgkvWCE7WMkK/pn00R16iM11NCHmfp+QM5vISW90WtML0CZd1 YWll0YviD2gYyiGushggjVs8tG+EPLFQkpzc8dM689582EnJHXqwju8awYN0TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756801865; 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; bh=oPkVJYaSyvM0Onu1ezQKhod5x/DXNi7J7phCn18wf20=; b=YqBovlVFoayeZmM0ZxjxmgpfKoiglgGY8mtcCkTdNwEDCcnN4AbA6hbbzIq5F8kHwhtlI5 P7udDJPlO77JbrSzbq0sVE3+VmpUHs8ie5AUtwRV8KPNyU7U1OvqqWagukcJ8Y4sp93VoX IXkvGsEf1CoS8SGf0VYvEAm4MZPQfgOVSCDhc8jVmAIWZkf1UlSxsDZapNB+mD1oJN6bqj LL3hAqiFwL4qZMiLhKbZIZI9g6W0UkNJradnXI9FZxJ48AVWmLm531xeb7Z8x12AD2FY2v dn+4yUXgxqTJCAtZfnuNHlFsY1YLF19bKidr2ZD+k4VyOPzonbEwO6zR7M5UwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756801865; a=rsa-sha256; cv=none; b=hpi+6QnKbIHJzTgF8RntxZhqInhH/8OhaB4219R4DT/oIiSh1DN8j9ZeWyVGRICNqn0yLp yBr4zrnWzDA60U+QGq1ghr7q2x/ZXUB2D49eHyLxmoY6RIdYuuysitFiyFbBGwAw1DNw2o DkT5jTJSr1e3C+5hNjKBmFGTScQCeMoU52l2C9+zmsYodXJ8wo0jWCBFy3v3BJsejJvG31 edc8kqruZWt/tjshd8tojv5n2TJTkL52PzQvJ+Hllw3QbCV2rkakefyPBpPQPz1W3XgRrA NUCl4gJre0cn4jEEXYnV1TX0P/9rbMMaP9dImesoglCAjnCgyks0B4SxSBGrXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4cGJqF3ZYJzfb1; Tue, 02 Sep 2025 08:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5828V5I3092566; Tue, 2 Sep 2025 08:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5828V5wg092563; Tue, 2 Sep 2025 08:31:05 GMT (envelope-from git) Date: Tue, 2 Sep 2025 08:31:05 GMT Message-Id: <202509020831.5828V5wg092563@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: aa730a66bc74 - main - sh: Add config tag to /.profile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa730a66bc74696df85b21ec2719c75d8eab8c9f Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=aa730a66bc74696df85b21ec2719c75d8eab8c9f commit aa730a66bc74696df85b21ec2719c75d8eab8c9f Author: Lexi Winter AuthorDate: 2025-09-02 08:22:56 +0000 Commit: Lexi Winter CommitDate: 2025-09-02 08:22:56 +0000 sh: Add config tag to /.profile The file /.profile is installed as a hard link to /root/.profile. The file in /root has the config tag, but the file in / does not, which causes it to be overwritten by pkg upgrade. Since they're linked, this also overwrites the file in /root. Add the config tag to the file in / as well, so pkg treates both links as config files and won't overwrite them. PR: 289097 MFC after: 3 days Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D52162 --- bin/sh/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 087dbf40c3bd..4dbbf344bfb5 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -74,6 +74,6 @@ beforeinstallconfig: LINKMODE=${CONFMODE} afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile + ${INSTALL_LINK} ${TAG_ARGS},config ${DESTDIR}/root/.profile ${DESTDIR}/.profile .include