aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-08-07 18:43:28 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-08-08 09:42:45 +0200
commit2f04dbc5abc3919e39a9707ce03ee380b7103e0d (patch)
tree87dff25d82b5b1011f4d19e2db97d8f5c22dd61b
parent1da38273874da7d17a946348278cd849fb8516e7 (diff)
Set explicit path for services and units
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>
-rw-r--r--conf/afm-unit-debug.conf.in1
-rw-r--r--conf/afm-unit.conf.in1
2 files changed, 2 insertions, 0 deletions
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}}\