From: Gordon Hecker <gh@emlix.com>
Date: Wed, 27 May 2009 11:06:48 +0000 (+0200)
Subject: introduce specific config files for patchlevels in config file search path
X-Git-Tag: e2factory-2.3.1pre1~15
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=bd6e0b159b2585741a60ee6f68c5c44f6cb69c30;p=e2factory.git

introduce specific config files for patchlevels in config file search path

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 28556e2..1a47457 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -766,9 +766,13 @@ function e2lib.read_global_config(e2_config_file)
   else
     cf_path = {
 	-- this is ordered by priority
+	string.format("%s/.e2/e2.conf-%s.%s.%s", e2lib.homedir,
+		buildconfig.MAJOR, buildconfig.MINOR, buildconfig.PATCHLEVEL),
 	string.format("%s/.e2/e2.conf-%s.%s", e2lib.homedir, buildconfig.MAJOR,
 							buildconfig.MINOR),
 	string.format("%s/.e2/e2.conf", e2lib.homedir),
+	string.format("/etc/e2/e2.conf-%s.%s.%s", 
+		buildconfig.MAJOR, buildconfig.MINOR, buildconfig.PATCHLEVEL),
 	string.format("/etc/e2/e2.conf-%s.%s", buildconfig.MAJOR,
                                                         buildconfig.MINOR),
 	string.format("/etc/e2/e2.conf"),