From 6f3ab4a255704a94eb46e3c6af980401e81b8e85 Mon Sep 17 00:00:00 2001
From: Herbert Wolverson <herberticus@gmail.com>
Date: Fri, 18 Apr 2025 14:39:48 -0500
Subject: [PATCH] Co-Authored-By: trendal

Applies Trendal's fixes for using the correct config location. Thanks!
---
 src/rust/lqos_config/src/etc/migration.rs | 4 ++--
 src/rust/lqos_config/src/etc/mod.rs       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rust/lqos_config/src/etc/migration.rs b/src/rust/lqos_config/src/etc/migration.rs
index 0873d801..b7cc2e11 100644
--- a/src/rust/lqos_config/src/etc/migration.rs
+++ b/src/rust/lqos_config/src/etc/migration.rs
@@ -24,10 +24,10 @@ pub enum MigrationError {
     PythonLoadError(#[from] PythonMigrationError),
 }
 
-pub fn migrate_if_needed() -> Result<(), MigrationError> {
+pub fn migrate_if_needed(config_location: &str) -> Result<(), MigrationError> {
     debug!("Checking config file version");
     let raw =
-        std::fs::read_to_string("/etc/lqos.conf").map_err(|e| MigrationError::ReadError(e))?;
+        std::fs::read_to_string(&config_location).map_err(|e| MigrationError::ReadError(e))?;
 
     let doc = raw
         .parse::<DocumentMut>()
diff --git a/src/rust/lqos_config/src/etc/mod.rs b/src/rust/lqos_config/src/etc/mod.rs
index c5f724be..93a37f35 100644
--- a/src/rust/lqos_config/src/etc/mod.rs
+++ b/src/rust/lqos_config/src/etc/mod.rs
@@ -52,7 +52,7 @@ pub fn load_config() -> Result<Arc<Config>, LibreQoSConfigError> {
     };
 
     debug!("Loading configuration file {config_location}");
-    migrate_if_needed().map_err(|e| {
+    migrate_if_needed(&config_location).map_err(|e| {
         error!("Unable to migrate configuration: {:?}", e);
         LibreQoSConfigError::FileNotFoud
     })?;