helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-16 22:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

nginx: fix kill path in nginx systemd unit file

Browse Source 
the kill utility is located in /bin/kill -> use base_bindir instead of bindir

Signed-off-by: Nicola Lunghi <nick83ola@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
nick83ola 2019-05-27 16:55:21 +01:00 committed by Khem Raj
parent acb604775e
commit dd5622ef2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-webserver/recipes-httpd/nginx/files/nginx.service
View File

@ -8,7 +8,7 @@ PIDFile=/run/nginx/nginx.pid
ExecStartPre=@SBINDIR@/nginx -t ExecStartPre=@SBINDIR@/nginx -t
ExecStart=@SBINDIR@/nginx ExecStart=@SBINDIR@/nginx
ExecReload=@SBINDIR@/nginx -s reload ExecReload=@SBINDIR@/nginx -s reload
ExecStop=@BINDIR@/kill -s QUIT $MAINPID ExecStop=@BASE_BINDIR@/kill -s QUIT $MAINPID
PrivateTmp=true PrivateTmp=true
[Install] [Install]

2
meta-webserver/recipes-httpd/nginx/nginx.inc
View File

@ -135,7 +135,7 @@ do_install () {
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
-e 's,@LOCALSTATEDIR@,${localstatedir},g' \ -e 's,@LOCALSTATEDIR@,${localstatedir},g' \
-e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \
-e 's,@BINDIR@,${bindir},g' \ -e 's,@BASE_BINDIR@,${base_bindir},g' \
${D}${systemd_unitdir}/system/nginx.service ${D}${systemd_unitdir}/system/nginx.service
fi fi
} }