From 51e4d5dc4a905082526717ebe138f43731d93d53 Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Thu, 25 Jun 2015 13:53:57 +0800 Subject: postfix: update daemon_directory in main.cf_2.0 daemon_directory is set to /usr/lib/postfix which causes daemon postfix fails to start on 64 bits target if enable multilib. Set daemon_directory with libexecdir to fix it. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/postfix/files/main.cf_2.0 | 2 +- meta-networking/recipes-daemons/postfix/postfix.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-networking/recipes-daemons/postfix') 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 9e1077f6b0..dc7feb57b7 100644 --- a/meta-networking/recipes-daemons/postfix/files/main.cf_2.0 +++ b/meta-networking/recipes-daemons/postfix/files/main.cf_2.0 @@ -30,7 +30,7 @@ queue_directory = /var/spool/postfix mail_spool_directory = /var/spool/mail readme_directory = no command_directory = /usr/sbin -daemon_directory = /usr/lib/postfix +daemon_directory = @LIBEXECDIR@ mail_owner = postfix setgid_group = postdrop unknown_local_recipient_reject_code = 450 diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 72bc9365da..fa75a78bab 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -142,6 +142,8 @@ do_install () { mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf install -d ${D}${sysconfdir}/init.d install -m 644 ${WORKDIR}/main.cf_2.0 ${D}${sysconfdir}/postfix/main.cf + sed -i 's#@LIBEXECDIR@#${libexecdir}#' ${D}${sysconfdir}/postfix/main.cf + install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient -- cgit 1.2.3-korg