[oe-commits] Bian Naimeng : postfix: don't hard-code PATH in service file
git at git.openembedded.org
git at git.openembedded.org
Mon Feb 23 19:03:17 UTC 2015
Module: meta-openembedded.git
Branch: master
Commit: 710459da208c89b44291b0fced8c288a14ad99b3
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=710459da208c89b44291b0fced8c288a14ad99b3
Author: Bian Naimeng <biannm at cn.fujitsu.com>
Date: Mon Feb 16 15:52:35 2015 +0800
postfix: don't hard-code PATH in service file
Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.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/postfix.service | 10 +++++-----
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 c781038..02ea640 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=- at 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 e73f2f0..a6909e9 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}
More information about the Openembedded-commits
mailing list