From dd5622ef2b4065dc80ee549c57a2ec5010d0b4d1 Mon Sep 17 00:00:00 2001 From: nick83ola Date: Mon, 27 May 2019 16:55:21 +0100 Subject: nginx: fix kill path in nginx systemd unit file the kill utility is located in /bin/kill -> use base_bindir instead of bindir Signed-off-by: Nicola Lunghi Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +- meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service index c6fc0495f1..9a6ca96517 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 d4c6e81fa3..e202e85637 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -135,7 +135,7 @@ do_install () { sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@BINDIR@,${bindir},g' \ + -e 's,@BASE_BINDIR@,${base_bindir},g' \ ${D}${systemd_unitdir}/system/nginx.service fi } -- cgit 1.2.3-korg