From: Gordon Hecker <gh@emlix.com>
Date: Wed, 27 May 2009 11:05:17 +0000 (+0200)
Subject: use buildconfig.MAJOR and buildconfig.MINOR in config file search path
X-Git-Tag: e2factory-2.3.1pre1~16
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=381e4d57acb8d1857d429e2540a00f7c6c5818c3;p=e2factory.git

use buildconfig.MAJOR and buildconfig.MINOR in config file search path
instead of hard-coded version string

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

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 74b0706..28556e2 100644
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -766,9 +766,11 @@ function e2lib.read_global_config(e2_config_file)
   else
     cf_path = {
 	-- this is ordered by priority
-	string.format("%s/.e2/e2.conf-2.2", e2lib.homedir),
+	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-2.2"),
+	string.format("/etc/e2/e2.conf-%s.%s", buildconfig.MAJOR,
+                                                        buildconfig.MINOR),
 	string.format("/etc/e2/e2.conf"),
     }
   end