From eeafe189630488a11c7d9cdc3b384e7f6163a547 Mon Sep 17 00:00:00 2001 From: Gordon Hecker Date: Tue, 23 Mar 2010 12:18:05 +0100 Subject: [PATCH] move config file config to globals table Signed-off-by: Gordon Hecker --- generic/e2lib.lua | 1 + local/e2tool.lua | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/generic/e2lib.lua b/generic/e2lib.lua index fa8ccae..15f28c8 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -94,6 +94,7 @@ globals = { buildnumber_server_url = nil, template_path = string.format("%s/templates", buildconfig.SYSCONFDIR), extension_config = ".e2/extensions", + e2config = ".e2/e2config", global_interface_version_file = ".e2/global-version", lock = nil, logrotate = 5, -- configurable via config.log.logrotate diff --git a/local/e2tool.lua b/local/e2tool.lua index 81c0766..4539647 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -458,7 +458,8 @@ The newest configuration syntax supported by the tools is %s. end -- try to get project specific config file paht - local config_file_config = string.format("%s/.e2/e2config", info.root) + local config_file_config = string.format("%s/%s", info.root, + e2lib.globals.e2config) local config_file = e2lib.read_line(config_file_config) -- don't care if this succeeds, the parameter is optional. -- 2.39.5