From c7045528df14645ad373f061a41223ebaef6f992 Mon Sep 17 00:00:00 2001 From: chrys Date: Wed, 14 Sep 2016 23:30:00 +0200 Subject: [PATCH] prepare for use etc as config --- src/fenrir-package/core/settingsManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fenrir-package/core/settingsManager.py b/src/fenrir-package/core/settingsManager.py index 8d7eb990..465b4606 100644 --- a/src/fenrir-package/core/settingsManager.py +++ b/src/fenrir-package/core/settingsManager.py @@ -204,7 +204,7 @@ class settingsManager(): except: return '' - def initFenrirConfig(self, environment = environment.environment, settingsRoot = '/etc/fenrir/config/'): + def initFenrirConfig(self, environment = environment.environment, settingsRoot = '/etc/fenrir/config/', settingsFile='settings.conf'): if not os.path.exists(settingsRoot): if os.path.exists('../../config/'): settingsRoot = '../../config/' @@ -212,7 +212,7 @@ class settingsManager(): return None environment['runtime']['settingsManager'] = self environment['runtime']['debug'] = debug.debug() - environment = environment['runtime']['settingsManager'].loadSettings(environment) + environment = environment['runtime']['settingsManager'].loadSettings(environment, settingsRoot + '/settings/' + settingsFile) environment = self.setFenrirKeys(environment, self.getSetting(environment, 'general','fenrirKeys')) if not os.path.exists(self.getSetting(environment, 'keyboard','keyboardLayout')): if os.path.exists(settingsRoot + 'keyboard/' + self.getSetting(environment, 'keyboard','keyboardLayout')):