From nobody Mon Mar 25 15:59:25 2024 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 4V3HgK6HCZz5FCpm; Mon, 25 Mar 2024 15:59:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V3HgK5gyXz4SXf; Mon, 25 Mar 2024 15:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711382365; 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=iePGU1cnfB8WoUFUlXbOCen9jVZ5GK9nN+KiM+l3MRc=; b=jA1BL4V+BWiKa8oEDIeFRSsM9aTH3mMpZ7lkrOnJWlaN1cjg0Jwkw9nRhYJYFTl6VKBCtf F+miaAfeHpioE3pqGJwmavwaFFaFU7kQUOZQD2CEKZr+98AhOKJwElIGQG6XXYfjXQK4as SVy1fxeD+gneP47jTCXOHDZozYaN6q7JEaCL2/9njeu4QqXssNxTs8p5JxSphb+oBCCGiP 4s0cVI1gM8nodGspa561DOqLcY097hjsl0vD57xjL7c8ZG6YEOieDepOZGJDMMUQjQKaF0 xSfDuzLcTFXzsMK2L2dCl7hZvzvL+sKeao36DLFCcnDUEA8n1afovuAScnDlxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711382365; a=rsa-sha256; cv=none; b=NC12ZFgtbFW2fBSfPGHvSNnartDaSyy4LEUCw2zvxYiGu1rhPqwoz9U5kZRyq1o219Jm6Z 36g0J1tZdzyAf7+H2bKc1AqWIo4EjGkNpIldAc7hNmWViTsjklUG/r/8kL+0UgZZLEd5se 4fhaU0GgGG3hJNFIR54v3x3r7Gg2+2GxBVzd278T1yR78vmqCqdoC4igZHCfgmDzSRX2m5 CJ3mcfX/EFkt0nt40c5yxUHltRJN7K0uO9w6EwRkMtvr264YbIPpFivHCu4SS6ERmfWrDj LTiTFG+3BJkosF/Jp0seCQsJ+sDcSazjLPLujbNHlgwQ6AYbbrrDZ3/G/zjwog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711382365; 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=iePGU1cnfB8WoUFUlXbOCen9jVZ5GK9nN+KiM+l3MRc=; b=AWxcRlnN8OxA0HHJv/OUSFRkrfzEw12A7n7KgGBZK7/ruzdYrCpcCxTD29hYoVCLJaEdXF FfT/LO7eUZaaDvjtBR1vuihj6uHOvD6YV73/abuZ9ZFOAgmUosqcnVud3nJpOru+bmbOux M1VDGto1rzNYPZHveVOBM9gHRecKavCd6PtVHfFH/0zImeflD/qhrHUpYMy4TSdhyMUbHI U6Jsy0teQJLxBpQyVUyNWSaIYB71234NXB1Lz3wQoG+h32tBT05BwjNVKCreA5Ln7iyFot Vnlg5ak8izLCwFiucx1F7kiYKEgiW3Z+KRBycpAuCOA023+LZi4wWYPsmfDrJg== 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 4V3HgK5J3KzN4j; Mon, 25 Mar 2024 15:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42PFxPVw083926; Mon, 25 Mar 2024 15:59:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42PFxP55083923; Mon, 25 Mar 2024 15:59:25 GMT (envelope-from git) Date: Mon, 25 Mar 2024 15:59:25 GMT Message-Id: <202403251559.42PFxP55083923@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3fed4f0db53a - main - certctl: Revert to symlinks. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fed4f0db53a66a0135bea5c491431eb3348cf51 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3fed4f0db53a66a0135bea5c491431eb3348cf51 commit 3fed4f0db53a66a0135bea5c491431eb3348cf51 Author: Mark Peek AuthorDate: 2024-03-25 15:58:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-25 15:59:02 +0000 certctl: Revert to symlinks. Unfortunately tar will not be able to extract base.txz to a system where /etc and /usr are not on the same filesystem if the certificates are hard links. PR: 277828 Reviewed by: mp Differential Revision: https://reviews.freebsd.org/D44496 --- usr.sbin/certctl/certctl.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh index 997a7d835d53..f95b4561d852 100755 --- a/usr.sbin/certctl/certctl.sh +++ b/usr.sbin/certctl/certctl.sh @@ -110,7 +110,7 @@ create_trusted() { local hash certhash otherfile otherhash local suffix - local link=${2:+-lm} + local link=${2:+-lrs} hash=$(do_hash "$1") || return certhash=$(openssl x509 -sha1 -in "$1" -noout -fingerprint) @@ -159,7 +159,7 @@ resolve_certname() create_untrusted() { local srcfile filename - local link=${2:+-lm} + local link=${2:+-lrs} set -- $(resolve_certname "$1") srcfile=$1