From b5b95422e7be2cb65a652fc9477246469668ed9c Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 10 Jan 2018 11:09:56 +0800 Subject: 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 Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/postfix/files/main.cf | 2 +- meta-networking/recipes-daemons/postfix/files/postfix.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-networking/recipes-daemons/postfix/files') 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 -- cgit v1.2.3-54-g00ecf