aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons/postfix/files
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-01-10 11:09:56 +0800
committerArmin Kuster <akuster808@gmail.com>2018-01-22 19:44:59 -0800
commite00f62713db4ca0c5cec3ffc9dae9b614d598116 (patch)
tree2bd571d120c94de54a5d3dbf840108a76adecd44 /meta-networking/recipes-daemons/postfix/files
parent4e6de263598a65871684b9098161f7842328bccd (diff)
downloadmeta-openembedded-contrib-e00f62713db4ca0c5cec3ffc9dae9b614d598116.tar.gz
postfix: fix generating aliases db files
When generating aliases db files, the newaliases tries to chdir /var/spool/postfix on the host. It would cause a failure if the host doesn't install postfix: newaliases: fatal: chdir /var/spool/postfix: No such file or directory Move this step from do_install to pkg_postinst to make sure newaliases and postmap run during the image creation. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/postfix/files')
-rw-r--r--meta-networking/recipes-daemons/postfix/files/main.cf2
-rw-r--r--meta-networking/recipes-daemons/postfix/files/postfix.service2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/main.cf b/meta-networking/recipes-daemons/postfix/files/main.cf
index 2371ace6e4..e75c6fc0d7 100644
--- a/meta-networking/recipes-daemons/postfix/files/main.cf
+++ b/meta-networking/recipes-daemons/postfix/files/main.cf
@@ -33,7 +33,7 @@ queue_directory = /var/spool/postfix
mail_spool_directory = /var/spool/mail
readme_directory = no
command_directory = /usr/sbin
-daemon_directory = @LIBEXECDIR@
+daemon_directory = @LIBEXECDIR@/postfix
mail_owner = postfix
setgid_group = postdrop
unknown_local_recipient_reject_code = 450
diff --git a/meta-networking/recipes-daemons/postfix/files/postfix.service b/meta-networking/recipes-daemons/postfix/files/postfix.service
index 3a9a0a1813..30d54a4405 100644
--- a/meta-networking/recipes-daemons/postfix/files/postfix.service
+++ b/meta-networking/recipes-daemons/postfix/files/postfix.service
@@ -7,7 +7,7 @@ Conflicts=sendmail.service exim.service
Type=forking
PIDFile=@LOCALSTATEDIR@/spool/postfix/pid/master.pid
ExecStartPre=-@SBINDIR@/check_hostname.sh
-ExecStartPre=-@LIBEXECDIR@/aliasesdb
+ExecStartPre=-@LIBEXECDIR@/postfix/aliasesdb
ExecStart=@SBINDIR@/postfix start
ExecReload=@SBINDIR@/postfix reload
ExecStop=@SBINDIR@/postfix stop