diff options
| author |   Bian Naimeng <biannm@cn.fujitsu.com> | 2015-02-16 15:52:35 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-02-23 13:53:32 -0500 |
| commit | 710459da208c89b44291b0fced8c288a14ad99b3 (patch) | |
| tree | d0706c6ad82a03df2c784efb2f4779d6ca7c7a6c /meta-networking | |
| parent | 9b67eabcec04c2927f61b7a256505d8813c763f8 (diff) | |
| download | meta-openembedded-contrib-710459da208c89b44291b0fced8c288a14ad99b3.tar.gz | |
postfix: don't hard-code PATH in service file
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/files/postfix.service | 10 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/postfix/postfix.inc | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/meta-networking/recipes-daemons/postfix/files/postfix.service b/meta-networking/recipes-daemons/postfix/files/postfix.service index c781038d88..02ea640b25 100644 --- a/meta-networking/recipes-daemons/postfix/files/postfix.service +++ b/meta-networking/recipes-daemons/postfix/files/postfix.service @@ -5,11 +5,11 @@ Conflicts=sendmail.service exim.service [Service] Type=forking -PIDFile=/var/spool/postfix/pid/master.pid -ExecStartPre=-/usr/libexec/postfix/aliasesdb -ExecStart=/usr/sbin/postfix start -ExecReload=/usr/sbin/postfix reload -ExecStop=/usr/sbin/postfix stop +PIDFile=@LOCALSTATEDIR@/spool/postfix/pid/master.pid +ExecStartPre=-@LIBEXECDIR@/aliasesdb +ExecStart=@SBINDIR@/postfix start +ExecReload=@SBINDIR@/postfix reload +ExecStop=@SBINDIR@/postfix stop [Install] WantedBy=multi-user.target diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index e73f2f098c..a6909e9b5b 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -147,7 +147,9 @@ do_install () { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/postfix.service ${D}${systemd_unitdir}/system - sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/postfix.service + sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_unitdir}/system/postfix.service + sed -i -e 's#@LOCALSTATEDIR@#${localstatedir}#g' ${D}${systemd_unitdir}/system/postfix.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/postfix.service install -m 0755 ${WORKDIR}/aliasesdb ${D}${libexecdir} |