From 736834ca957697d618b70979764bc422ab6952d2 Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Mon, 7 Aug 2017 18:43:28 +0200
Subject: Set explicit path for services and units
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This patch removes references to /usr/local and
add reference to the installation directory.
The companion programs can be run using path
relatives to the installation directory.
Bug-AGL: SPEC-384
Change-Id: I7e10be1d0df1b62f3be0104f88d1787dd849d152
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
conf/afm-unit-debug.conf.in | 1 +
conf/afm-unit.conf.in | 1 +
2 files changed, 2 insertions(+)
(limited to 'conf')
diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in
index 3a3ef44..2bc2959 100644
--- a/conf/afm-unit-debug.conf.in
+++ b/conf/afm-unit-debug.conf.in
@@ -132,6 +132,7 @@ SuccessExitStatus=0 SIGKILL
WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}}
ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}}
Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
+Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
; Needed to enable debug
Environment=AFM_ID={{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index 5d4a58c..e6163e2 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -132,6 +132,7 @@ SuccessExitStatus=0 SIGKILL
WorkingDirectory=-{{&#metadata.app-data-dir}}/{{id}}
ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{id}}
Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}}
+Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
%systemd-unit user
{{#required-permission.urn:AGL:permission::public:hidden}}\
--
cgit