diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-02-06 20:41:58 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-02-06 20:41:58 +0900 |
| commit | f9b69c94bccc90e9dcf78c901a277c5fcddb679b (patch) | |
| tree | 614d06cc6b4d7caa7b7e3a024a6d0443b94a93b7 | |
| parent | 68aefa6d59e0e7f55fb1abb383b2fffbf4ef0944 (diff) | |
internal/rosa/ssl: prefix CA paths
This makes prefixes consistent with everything else since this will end up in the final Rosa OS image.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | internal/rosa/curl.go | 1 | ||||
| -rw-r--r-- | internal/rosa/ssl.go | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/internal/rosa/curl.go b/internal/rosa/curl.go index ae53885f..c2022ca1 100644 --- a/internal/rosa/curl.go +++ b/internal/rosa/curl.go @@ -17,6 +17,7 @@ func (t Toolchain) newCurl() pkg.Artifact { }, Configure: [][2]string{ {"with-openssl"}, + {"with-ca-bundle", "/system/etc/ssl/certs/ca-bundle.crt"}, }, ScriptConfigured: ` make "-j$(nproc)" diff --git a/internal/rosa/ssl.go b/internal/rosa/ssl.go index 7d53abc4..997411c4 100644 --- a/internal/rosa/ssl.go +++ b/internal/rosa/ssl.go @@ -71,14 +71,14 @@ func (t Toolchain) newNSSCACert() pkg.Artifact { t.Load(NSS), t.Load(buildcatrust), }, nil, nil, ` -mkdir -p /work/etc/ssl/{certs/unbundled,certs/hashed,trust-source} +mkdir -p /work/system/etc/ssl/{certs/unbundled,certs/hashed,trust-source} buildcatrust \ --certdata_input /system/nss/certdata.txt \ - --ca_bundle_output /work/etc/ssl/certs/ca-bundle.crt \ - --ca_standard_bundle_output /work/etc/ssl/certs/ca-no-trust-rules-bundle.crt \ - --ca_unpacked_output /work/etc/ssl/certs/unbundled \ - --ca_hashed_unpacked_output /work/etc/ssl/certs/hashed \ - --p11kit_output /work/etc/ssl/trust-source/ca-bundle.trust.p11-kit + --ca_bundle_output /work/system/etc/ssl/certs/ca-bundle.crt \ + --ca_standard_bundle_output /work/system/etc/ssl/certs/ca-no-trust-rules-bundle.crt \ + --ca_unpacked_output /work/system/etc/ssl/certs/unbundled \ + --ca_hashed_unpacked_output /work/system/etc/ssl/certs/hashed \ + --p11kit_output /work/system/etc/ssl/trust-source/ca-bundle.trust.p11-kit `) } func init() { artifactsF[NSSCACert] = Toolchain.newNSSCACert } |