]> git.e2factory.org Git - e2factory.git/commitdiff
use buildconfig.MAJOR and buildconfig.MINOR in config file search path
authorGordon Hecker <gh@emlix.com>
Wed, 27 May 2009 11:05:17 +0000 (13:05 +0200)
committerGordon Hecker <gh@emlix.com>
Wed, 27 May 2009 11:05:17 +0000 (13:05 +0200)
instead of hard-coded version string

Signed-off-by: Gordon Hecker <gh@emlix.com>
generic/e2lib.lua

index 74b07068fc6f93e1e9ee8e103c039ae74cf8f454..28556e24f79b7925b124d4771a22b7f558d8cd4d 100644 (file)
@@ -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