From b86ab5aa2105f6a12aea5276bffa27137711db2b Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 14 Nov 2023 17:25:05 +0000 Subject: [PATCH] runtime-rs: Update list of config paths to check Update the `DEFAULT_RUNTIME_CONFIGURATIONS` list to include a number of rust runtime specific paths to try to load before checking the "traditional" (golang) runtime configuration paths. Signed-off-by: James O. D. Hunt --- src/libs/kata-types/src/config/default.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libs/kata-types/src/config/default.rs b/src/libs/kata-types/src/config/default.rs index f55f597da2..ca95fcbc3c 100644 --- a/src/libs/kata-types/src/config/default.rs +++ b/src/libs/kata-types/src/config/default.rs @@ -14,6 +14,12 @@ use lazy_static::lazy_static; lazy_static! { /// Default configuration file paths, vendor may extend the list pub static ref DEFAULT_RUNTIME_CONFIGURATIONS: Vec::<&'static str> = vec![ + // The rust runtime specific paths + "/etc/kata-containers/runtime-rs/configuration.toml", + "/usr/share/defaults/kata-containers/runtime-rs/configuration.toml", + "/opt/kata/share/defaults/kata-containers/runtime-rs/configuration.toml", + + // The traditional golang paths "/etc/kata-containers/configuration.toml", "/usr/share/defaults/kata-containers/configuration.toml", "/opt/kata/share/defaults/kata-containers/configuration.toml",