@@ -19,6 +19,11 @@ order:
- LIBCAMERA_SYSCONF_DIR/configuration.yaml
- /etc/libcamera/configuration.yaml
+If LIBCAMERA_CONFIG_DIR environment variable is non-empty then it
+specifies additional directories where to look for the configuration
+file, before looking at the standard locations. It can be a single
+directory or multiple directories separated by colons.
+
The default name of the configuration file, configuration.yaml, can be
overridden in LIBCAMERA_CONFIG_NAME environment variable. The variable
can specify just an alternative configuration file name to be looked up
@@ -75,12 +75,6 @@ bool GlobalConfiguration::loadFile(const std::filesystem::path &fileName)
return true;
}
-const std::vector<std::filesystem::path>
- globalConfigurationDirectories = {
- std::filesystem::path(LIBCAMERA_SYSCONF_DIR),
- std::filesystem::path("/etc/libcamera"),
- };
-
void GlobalConfiguration::load()
{
const char *libcameraConfigName =
@@ -97,6 +91,15 @@ void GlobalConfiguration::load()
if (configName.empty())
configName = std::filesystem::path("configuration.yaml");
+ const char *const configDir = utils::secure_getenv("LIBCAMERA_CONFIG_DIR");
+ std::vector<std::filesystem::path> globalConfigurationDirectories;
+ if (configDir)
+ for (auto const &path : utils::split(configDir, ":"))
+ if (!path.empty())
+ globalConfigurationDirectories.push_back(path);
+ globalConfigurationDirectories.push_back(LIBCAMERA_SYSCONF_DIR);
+ globalConfigurationDirectories.push_back("/etc/libcamera");
+
std::filesystem::path userConfigurationDirectory;
char *xdgConfigHome = utils::secure_getenv("XDG_CONFIG_HOME");
if (xdgConfigHome) {
A newly introduced LIBCAMERA_CONFIG_DIR environment variable specifies a directory or a list of directories separated by colons where to look for the libcamera configuration file before trying the standard locations. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- Documentation/runtime_configuration.rst | 5 +++++ src/libcamera/base/global_configuration.cpp | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)