[OE-core] [oe][PATCH 2/2] nginx: Fix systemd service file

Amarnath Valluri amarnath.valluri at intel.com
Fri Nov 6 13:18:33 UTC 2015


systemd service file expects full path of the executatbles.

Signed-off-by: Amarnath Valluri <amarnath.valluri at intel.com>
---
 meta-webserver/recipes-httpd/nginx/files/nginx.service | 2 +-
 meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/nginx/files/nginx.service b/meta-webserver/recipes-httpd/nginx/files/nginx.service
index 705450e..9926a4b 100644
--- a/meta-webserver/recipes-httpd/nginx/files/nginx.service
+++ b/meta-webserver/recipes-httpd/nginx/files/nginx.service
@@ -4,7 +4,7 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=@SYSCONFDIR@/nginx/run/nginx.pid
-ExecStartPre=mkdir -p @LOCALSTATEDIR@/log/nginx
+ExecStartPre=@BASEBINDIR@/mkdir -p @LOCALSTATEDIR@/log/nginx
 ExecStart=@SYSCONFDIR@/init.d/nginx start
 ExecStop=@SYSCONFDIR@/init.d/nginx stop
 [Install]
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb
index 1c9bff7..87c953b 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.9.5.bb
@@ -94,6 +94,7 @@ do_install () {
             install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/
             sed -i -e 's, at SYSCONFDIR@,${sysconfdir},g' \
                     -e 's, at LOCALSTATEDIR@,${localstatedir},g' \
+                    -e 's, at BASEBINDIR@,${base_bindir},g' \
                     ${D}${systemd_unitdir}/system/nginx.service
         fi
 }
-- 
1.9.1

---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki 
Business Identity Code: 0357606 - 4 
Domiciled in Helsinki 

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.




More information about the Openembedded-core mailing list