From nobody Tue Sep 2 11:38:25 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 4cGNzk0z4qz66Z4k; Tue, 02 Sep 2025 11:38:42 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGNzj5CnNz3Nqs; Tue, 02 Sep 2025 11:38:41 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; none Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id E1879A64805; Tue, 02 Sep 2025 11:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1756813100; bh=ycXkdHgzMln8dSPs+Dzryru5XHIx9at3/C3r6sfBfUM=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=PASvBklVELuYOZTb2cGvgVuBFJUhXpPgIbYJbyPJRaMrZJL9/Nkwbh2CGQpubQHgW OHJztU5HYnmspzVkBkpAHZRDmZ1kX06F8LBrkcvNlvjeGaoZntCTgX2VXDsik2w+9o kD+PGaY+8pciFY0MbaQb/9AEEZ/2dkcEMP9dF3N7RO6ud97u0EfsSdR+kT4hlRFffi 7f674Tslu6cVzcG+ae8BfTcNl40678Ddl/V9+oXqsBOUG9zf6GGjoyqwGkDHVU8Ks3 5SKmahNDRFTIBITGBLRvo09PemOoiuBNfRUe0o2frBwPlPGuozYtCuwa2cvAm0v0EQ 9mvpRDyboVTUttDK/xF3/ppSIYXCoTPNUH4OP4RSH2EpeqYv8HDGE1qiu2ErqJ7rnk aw43Kwj7NiO+wuggyg6+R6Zoxkx6tFm2EKsVtH9Oyau44Q2D3jti1z496uT1bxH5OB EZJ5zO3+hIbAC1xHiQDdcI42FWUks0/MsU11lfaOUf4CxeDR1DyLsr6qbJRit3PC5f yxObH9wfjLenJQnSJkPsiSL6ikhy6mKnudamY2+o58Eh02tyNBvTkTFy3LMNBoXugc jB2b9/oeGLy1WSj1QOiqhnFKlZXulyt8zMuiVyxxf1LKkuHdBUFyvgw62x36JA53ia j9ABMGOHnkwvuQ7NR2/FGEQY= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 313982D029E3; Tue, 2 Sep 2025 11:38:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id JpwwT53b-9cu; Tue, 2 Sep 2025 11:38:27 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:a66b:b6ff:fe40:39a9]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id E737E2D029D8; Tue, 2 Sep 2025 11:38:26 +0000 (UTC) Date: Tue, 2 Sep 2025 11:38:25 +0000 (UTC) From: "Bjoern A. Zeeb" To: Lexi Winter cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: aa730a66bc74 - main - sh: Add config tag to /.profile In-Reply-To: <202509020831.5828V5wg092563@gitrepo.freebsd.org> Message-ID: <5p49s627-11ps-53ns-s327-550s12o38q96@yvfgf.mnoonqbm.arg> References: <202509020831.5828V5wg092563@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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=US-ASCII; format=flowed X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cGNzj5CnNz3Nqs On Tue, 2 Sep 2025, Lexi Winter wrote: > 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 make distribution ... I assume... now fails: ... ===> bin/rm (installconfig) ===> bin/rmdir (installconfig) ===> bin/setfacl (installconfig) ===> bin/sh (installconfig) install: target directory `/dest/foo/.profile' does not exist usage: install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] [-B suffix] [-l linkflags] [-N dbdir] file1 file2 install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] [-B suffix] [-l linkflags] [-N dbdir] file1 ... fileN directory install -dU [-vU] [-g group] [-m mode] [-N dbdir] [-o owner] [-M log] [-D dest] [-h hash] [-T tags] directory ... *** Error code 64 Stop. make[4]: stopped making "installconfig" in /usr/usr/bin/sh > --- > 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 > -- Bjoern A. Zeeb r15:7