From c13c77f44957431e65c8deff7fbb596fcde12efe Mon Sep 17 00:00:00 2001 From: Gerorge Liao Date: Fri, 7 Feb 2025 15:20:09 +0100 Subject: [PATCH] [platform] move the get_root_cert_path function from unix to linux. --- src/platform/platform_linux.cpp | 11 +++++++++++ src/platform/platform_unix.cpp | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/platform/platform_linux.cpp b/src/platform/platform_linux.cpp index 6b1245ffc2..69b8849683 100644 --- a/src/platform/platform_linux.cpp +++ b/src/platform/platform_linux.cpp @@ -470,3 +470,14 @@ std::string multipass::platform::host_version() return mpu::in_multipass_snap() ? multipass::platform::detail::read_os_release() : fmt::format("{}-{}", QSysInfo::productType(), QSysInfo::productVersion()); } + + +std::filesystem::path mp::platform::Platform::get_root_cert_path() const +{ + constexpr auto* root_cert_file_name = "multipass_root_cert.pem"; + + return mp::utils::in_multipass_snap() + ? std::filesystem::path{mp::utils::snap_common_dir().toStdString()} / "data/multipassd/certificates" / + root_cert_file_name + : std::filesystem::path{"/usr/local/share/ca-certificates"} / root_cert_file_name; +} diff --git a/src/platform/platform_unix.cpp b/src/platform/platform_unix.cpp index 3c6de6e7bc..4896fcef5d 100644 --- a/src/platform/platform_unix.cpp +++ b/src/platform/platform_unix.cpp @@ -242,13 +242,3 @@ long long mp::platform::Platform::get_total_ram() const { return static_cast(sysconf(_SC_PHYS_PAGES)) * sysconf(_SC_PAGESIZE); } - -std::filesystem::path mp::platform::Platform::get_root_cert_path() const -{ - constexpr auto* root_cert_file_name = "multipass_root_cert.pem"; - - return mp::utils::in_multipass_snap() - ? std::filesystem::path{mp::utils::snap_common_dir().toStdString()} / "data/multipassd/certificates" / - root_cert_file_name - : std::filesystem::path{"/usr/local/share/ca-certificates"} / root_cert_file_name; -}