From nobody Sun Jun 28 18:40:54 2026 X-Original-To: dev-commits-src-all@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 4gpJBt3QZxz6jl5j for ; Sun, 28 Jun 2026 18:40:54 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpJBt2JPdz3YP9 for ; Sun, 28 Jun 2026 18:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782672054; 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=QLCRtaGGiDnrswM/s2aXA4f0ZwBvVBjsiLUPn7fUqPk=; b=Jor3QFMNa6Q9z5xUm6k4LOHSeAw8MCRjFfeN0rcNmUvtrU5hzJce0+DRsCYmsK/kl+RIFr 3I7I5MMemHzhchq16OFO+jI9DuGS+Xe9KE7ztFuxM7p4cTQdSYrOS67Hgab8+duKLF85At HBWtzNA/ovdZmktVKcI8BnnTdLGuZXScfMuMfMRO8v+AYL8MGnQPCjHzK/AmvT5XdmriHA 8CfarpDvyXZ/ROTMdD4vwuDkkEzpewuZeAaQFt378u9etoxeveqsVqmlpUbKwP1c98d5oN zcMgXkFI19mGhCgS0AeosLREPejgY53ljs24BH7M0eHyKrEWfaaXVXAIbXjJRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782672054; a=rsa-sha256; cv=none; b=MwpoRvPsAoY8EInOa9TN13AI0LKib0JUY21FYbdedLOo3Ma1u0EBQiytwWkEsZTz6uUSMu FqpwjlPnTaA8BtLEPi6vgwv0Ci/rLgef+3eMWpLL8Z8OBPdeSg1lxs9uaETDOJdM+ctiHZ a3/U+ki3y52S5K29TjUz/X2dmw7sz4tPWa5Ur9gOBC1zerz6bG7ikXlrClIGt8hechLb6h vzvnxTT0hjK3i+7NUuNYN1gpltiimBV9Epn1PCI8hkDtxP71fzYbfEkvAW8EXDso5FYdhM LHdnNUUV6RIIZRZ8T572WhCye7m8KQyomuPSXTikzKPG01U+0MATU49YQsXSeg== 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=1782672054; 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=QLCRtaGGiDnrswM/s2aXA4f0ZwBvVBjsiLUPn7fUqPk=; b=Wj0VPcLsjS3Tm9E7yfafUXBPiat9crlxCalfX5I99yUV2nT3sbNpLzR7UulsNr5VCiDILV YXXE3vt31Kxek07EwPnwIM5SBngfVxxBPyuB8RwAJtWIBw1KO1cdO82kWRcGypiLsd/xT9 gaCYKh6XrddbAEWx7Y/qJWhNPZmxXCoPFMNlRDngfWB6BqBJHbtIyIj5zKo4z/m/4oBgpx 5RZxsoxpq72TNPgpcPjrJ2QFPgUTbXqP3juuYtR9yDD2zTpRmXNO7GnW2L33cqCPTiOw4O wXmnICewRTlsZrDsTr6kW36NXglXZ0VvWgPnj8wv2hr2ukyuLT5ecWXTIexkOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpJBt1DXTz73P for ; Sun, 28 Jun 2026 18:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c518 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 18:40:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7aefe34615c3 - stable/15 - nuageinit: install certs in /usr/share/certs/trusted List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7aefe34615c33ef8b6136a998e87fa13bf272e05 Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 18:40:54 +0000 Message-Id: <6a416ab6.1c518.2956efad@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7aefe34615c33ef8b6136a998e87fa13bf272e05 commit 7aefe34615c33ef8b6136a998e87fa13bf272e05 Author: Baptiste Daroussin AuthorDate: 2026-06-06 19:30:53 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-28 18:39:56 +0000 nuageinit: install certs in /usr/share/certs/trusted Suggested by: kevans (cherry picked from commit e5ef12ccd01f8ec6c519bf2a56cac2808f78c51a) --- libexec/nuageinit/nuageinit | 2 +- libexec/nuageinit/nuageinit.7 | 2 +- libexec/nuageinit/tests/nuageinit.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 8e207cae0a15..9a0399ad4862 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -572,7 +572,7 @@ local function ca_certs(obj) if obj.ca_certs == nil then return end local trusted = obj.ca_certs.trusted if trusted == nil or #trusted == 0 then return end - local certdir = root .. "/etc/ssl/certs" + local certdir = root .. "/usr/share/certs/trusted" nuage.mkdir_p(certdir) for i, cert in ipairs(trusted) do local certpath = certdir .. "/nuageinit-" .. i .. ".pem" diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 0bd652ae4fd5..e1c4b9d61382 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -276,7 +276,7 @@ The following keys are recognized: .It trusted A list of PEM-encoded CA certificates to add to the system trust store. Certificates are written to -.Pa /etc/ssl/certs/ +.Pa /usr/share/certs/trusted/ and .Xr certctl 8 rehash is executed. diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index b225289718e6..798ac235e122 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1275,8 +1275,8 @@ ca_certs: -----END CERTIFICATE----- EOF atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 - atf_check -o match:"dGVzdGNlcnQx" cat etc/ssl/certs/nuageinit-1.pem - atf_check -o match:"dGVzdGNlcnQy" cat etc/ssl/certs/nuageinit-2.pem + atf_check -o match:"dGVzdGNlcnQx" cat usr/share/certs/trusted/nuageinit-1.pem + atf_check -o match:"dGVzdGNlcnQy" cat usr/share/certs/trusted/nuageinit-2.pem true }