[oe] [meta-webserver][PATCH] nginx: fix kill path in nginx systemd unit file
Nicola Lunghi
nick83ola at gmail.com
Mon May 27 15:55:21 UTC 2019
the kill utility is located in /bin/kill -> use base_bindir instead of bindir
Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
---
meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +-
meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service
index c6fc0495f..9a6ca9651 100644
--- a/meta-webserver/recipes-httpd/nginx/files/nginx.service
+++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service
@@ -8,7 +8,7 @@ PIDFile=/run/nginx/nginx.pid
ExecStartPre=@SBINDIR@/nginx -t
ExecStart=@SBINDIR@/nginx
ExecReload=@SBINDIR@/nginx -s reload
-ExecStop=@BINDIR@/kill -s QUIT $MAINPID
+ExecStop=@BASE_BINDIR@/kill -s QUIT $MAINPID
PrivateTmp=true
[Install]
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 29e7efc14..c4c776e37 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -134,7 +134,7 @@ do_install () {
sed -i -e 's, at SYSCONFDIR@,${sysconfdir},g' \
-e 's, at LOCALSTATEDIR@,${localstatedir},g' \
-e 's, at SBINDIR@,${sbindir},g' \
- -e 's, at BINDIR@,${bindir},g' \
+ -e 's, at BASE_BINDIR@,${base_bindir},g' \
${D}${systemd_unitdir}/system/nginx.service
fi
}
--
2.20.1
More information about the Openembedded-devel
mailing list