From nobody Tue Sep 2 12:06:43 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 4cGPc320Zdz66cCm; Tue, 02 Sep 2025 12:06:43 +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 4cGPc31Vm9z3RXl; Tue, 02 Sep 2025 12:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756814803; 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=CP4NBbfqn6g1Bzo1j2FtloJPjTOFMi/CGHUPOkiLvMk=; b=ERBcYfGP+jz6iX3CfJHfgaCw4mlR08QWqV6fO+vOAMAg5DgBnvh4gYuQTuCocJFNbGDTjz Zs8lpu1OwHatUHbBk4xzr/DGzT4931pKvlNIvmzbiafAT+FQEdRxKSgA9b0yAwwXPLe8mY OmRd+KzdwKmMglifYs1GtzPJsW3i4y+0IlfJTlwwJzwwrxaRBgDiy5fwVwYzD/DOc8v682 rZXxTHaHQ/hTDwTcXI54t5aL2pNGoCyy48fVMXVnJb03WYnGag3nkkZYJSSw9yW/bNRqbB da8QemBPwFpCtSz9qg9cm+EeLEB60nNW8Y5Hc3TiVMwhOhFyCSu2n6EowlpmcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756814803; 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=CP4NBbfqn6g1Bzo1j2FtloJPjTOFMi/CGHUPOkiLvMk=; b=ZZ9ZHxI58edeWHIdi2jB/L3a6l8/rKVKcQWVAP16jgES/YYkNMsW+KJIfZF4iuxVBCFE6h c48iKeEE2hKnKpPPOn1uCFpgKKZnSL7nly8m+aNN20U/llhCYIvFifS9E/7aedJ5iWMRTG ZE7emLKPv2qVe4NbDc1jQ8vFtqcTIteTLr0V2zazPhsohSZRdaK7+0X+VlMDQDEM0kMqD5 5H8+WybRMSywN5xD6jsiaUdEpTT5R1W1Z/ZvYjfIEYqXR6G8mXUkYGBPbpKHDkpVsWNiLi a62omYBLUj8cI3jTJDl9JxIBWiEg31A4hZHdbsDXcHHfxJNcg3uyKRJZA5ffQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756814803; a=rsa-sha256; cv=none; b=XQcANjvnFs2QmXJTUhWIfuTdkRkJtfD9MUSgWVTtocIsnxNs09OaND+E2ZiN2ExmHOAuao cX1V0fIdFdx+FaQ2GrYNC47KsHXMBN7ulMoofQyRs/Rr8rmIZ99naeODYEZzr6aNpoXUOt Y5irKiBAwCvhq3a3KD8YbfmxwZF3MRf6O3/7fYeDSYF7xsZItJEYc00yjhUI7+x9/sf5ks T/FpIbk9Y7ioFqQC48zrsGf7UcqR6JqZjojOnfBmciWWhkRpzp/S/w/HeWU7qn7yMyttaw JP+edJHYn2ACcI3uwLEb7Ukla6QoN9JM3S0p0o5aaRGrZfJjgF+BRYZS5QacXA== 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 4cGPc311PLzm09; Tue, 02 Sep 2025 12:06:43 +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 582C6hUX098040; Tue, 2 Sep 2025 12:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582C6hAQ098037; Tue, 2 Sep 2025 12:06:43 GMT (envelope-from git) Date: Tue, 2 Sep 2025 12:06:43 GMT Message-Id: <202509021206.582C6hAQ098037@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: b197d2abcb68 - main - sh: Fix non-NO_ROOT installconfig 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: b197d2abcb6895d78bc9df8404e374397aa44748 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=b197d2abcb6895d78bc9df8404e374397aa44748 commit b197d2abcb6895d78bc9df8404e374397aa44748 Author: Lexi Winter AuthorDate: 2025-09-02 11:47:36 +0000 Commit: Lexi Winter CommitDate: 2025-09-02 11:47:36 +0000 sh: Fix non-NO_ROOT installconfig When building without NO_ROOT, ${TAG_ARGS} is not set, which means we pass ",config" as an install(1) argument. Only add the config tag if ${TAG_ARGS} is defined to begin with. Fixes: aa730a66bc74 ("sh: Add config tag to /.profile") Reported by: bz --- bin/sh/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 4dbbf344bfb5..916bb88b57fa 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -74,6 +74,6 @@ beforeinstallconfig: LINKMODE=${CONFMODE} afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS},config ${DESTDIR}/root/.profile ${DESTDIR}/.profile + ${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},config} ${DESTDIR}/root/.profile ${DESTDIR}/.profile .include