[oe-commits] Kang Kai : postfix: remove overriding config config_directory

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 1ecd7bbba8c08ecd7cadb6575286c6ae70159de3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1ecd7bbba8c08ecd7cadb6575286c6ae70159de3

Author: Kang Kai <kai.kang at windriver.com>
Date:   Thu Oct 16 17:02:41 2014 +0800

postfix: remove overriding config config_directory

postfix 2.11.1 adds overriding config check. In postinstall script, it
calls command newaliases to read configure file main.cf_2.0.
config_directory is set in config main.cf_2.0, but it is an overriding
config and warning shows when build an image:

WARNING: log_check: There is a warn message in the logfile
WARNING: log_check: Matched keyword: [warn]
WARNING: log_check: newaliases: warning:
/buildarea3/kkang/poky/qemuarm-build/tmp/work/qemuarm-poky-linux-gnueabi/core-
image-minimal/1.0-r0/rootfs/etc/postfix/main.cf, line 27: overriding
earlier entry: config_directory=/buildarea3/kkang/
poky/qemuarm-build/tmp/work/qemuarm-poky-linux-gnueabi/core-image-minimal/1.0-r0/rootfs/etc/postfix

Remove config_directory setting in main.cf_2.0 to avoid this warning.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf_2.0 b/meta-networking/recipes-daemons/postfix/files/main.cf_2.0
index a128faa..bb31451 100644
--- a/meta-networking/recipes-daemons/postfix/files/main.cf_2.0
+++ b/meta-networking/recipes-daemons/postfix/files/main.cf_2.0
@@ -24,7 +24,7 @@ virtual_gid_maps = static:`grep vmail /etc/passwd | cut -d ":" -f 4`
 
 
 # General stuff here again
-config_directory = /etc/postfix
+#config_directory = /etc/postfix
 sample_directory = /etc/postfix
 queue_directory = /var/spool/postfix
 mail_spool_directory = /var/spool/mail