From nobody Sat Jun 6 19:31:38 2026 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 4gXpMZ3WJVz6gGNj for ; Sat, 06 Jun 2026 19:31:38 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gXpMZ1Dgqz40D3 for ; Sat, 06 Jun 2026 19:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780774298; 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=kYRdNLc20Su96+L5HScmD+wnH0YVIvPdv81wnFCdRqM=; b=sq4tSuRU7nhVescomwI1iRUnCsv4szAHe6Wpv1p0MAC9JuZIeMC8ef+Lb+hH2Pra+qnGF/ uw6qm5jC5urDqXSNhGRj7wC2pcCL6/QZGemqkWVJiHKz/Gt1XgDMEQw0V7aYXGmcRrXp8r UNg2o4C+7XNRt7pVAkSVjLNCjcV/2spa+iSVIyHxzKPFAPJHsetVolYKJ5ef68XcjQvz1Q vOg7e7Th1jZTiGPm43NggNCgUZqk1vf7ifLj1/QNy+WKs8ZgO1o/ADaTcUNdQohn6YvZ6v kaBTQaI37Ngs2loj6S8ufaRjyCynoFaaHabWEm+ds7/B4IqrJRThbHQAgZZxMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780774298; a=rsa-sha256; cv=none; b=qZcDQ7l/tXOJU3n4blFECRex9Ga4pNxPWq94isdxKO81exXWzpJXxN0WLXrEl7zB8hEdJd tVBCQwCBpHtBKrf9V0ABJ4qXJYsDsty3sAECa0xFwWk3GhzuWPKqaUjMAz3mV7IcBOPGfm iR/hvrCTmANu6r5NW9dWX+PeX/gV1e1yYaFlzgC+dEl6JpRz71hahzcb3hzHPRiAS5kvzp TsqVp+UJQR1jJsCnT6kt/RlIK2A/FtPaJQlUNLz/wmrK+Eq0v2yfuKgPx5Bq/prynPRxV4 1dfpxVQF97cH6B6x0Fe5ixNnc5PFwznSaP4Pas9Gt1tuwP8wjQmdGNhYzcIohg== 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=1780774298; 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=kYRdNLc20Su96+L5HScmD+wnH0YVIvPdv81wnFCdRqM=; b=V+FkZg+blkwJDO+BQv4fxClmaGqRInOTh1SmHi4CwRJxKetMKrbUdW2DekDPbnzs0QCTy3 BeyI1P/yIPLEGAncHVtPWJAjUWc3nzmx6ZUOZmAp4dYUcbr68sePAovtEoRbfhmBSGWXj8 sFe8rFtchuESF6wshAQJVfmoUZ4uvYpBGjn2f93qkB/1iOBsPGLQ90LRW5mneWhRVXaZeD 6SeksZRlXgT7QidmzLWR+QclRScBN5vGAEEF/y87omNfgA0I5x8wHB+K63iS1q+XgMD+Vd fjxmYx/7bdFvy3kCMY1nfYMwZ65JA5kisdr04AUI9/u2nEe/hM1Nzmp6Cb2qaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gXpMZ0r26zD86 for ; Sat, 06 Jun 2026 19:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d724 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Jun 2026 19:31:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e5ef12ccd01f - main - nuageinit: install certs in /usr/share/certs/trusted 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 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/main X-Git-Reftype: branch X-Git-Commit: e5ef12ccd01f8ec6c519bf2a56cac2808f78c51a Auto-Submitted: auto-generated Date: Sat, 06 Jun 2026 19:31:38 +0000 Message-Id: <6a24759a.3d724.1cecb5d6@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e5ef12ccd01f8ec6c519bf2a56cac2808f78c51a commit e5ef12ccd01f8ec6c519bf2a56cac2808f78c51a Author: Baptiste Daroussin AuthorDate: 2026-06-06 19:30:53 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-06 19:31:21 +0000 nuageinit: install certs in /usr/share/certs/trusted Suggested by: kevans --- 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 }