]> git.e2factory.org Git - e2factory.git/commitdiff
introduce specific config files for patchlevels in config file search path
authorGordon Hecker <gh@emlix.com>
Wed, 27 May 2009 11:06:48 +0000 (13:06 +0200)
committerGordon Hecker <gh@emlix.com>
Wed, 27 May 2009 11:08:49 +0000 (13:08 +0200)
Signed-off-by: Gordon Hecker <gh@emlix.com>
generic/e2lib.lua

index 28556e24f79b7925b124d4771a22b7f558d8cd4d..1a47457f6cdc463897023f4165683d70e17cade5 100644 (file)
@@ -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"),