aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-08-08 15:35:32 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-08-08 15:35:32 +0200
commitad8b7c3ad94dd464175e26080e4152bff408d6da (patch)
treee64c2666cddb9d8fc4e8783ca1ec49a61ef4b2db
parentc6a0f3884ebb85f6c9b6eec631ac78b6fe27f4f5 (diff)
afm-unit.conf: refactor LD_LIBRARY_PATH value
Changes from LD_LIBRARY_PATH=$ORIGIN/$LIB to LD_LIBRARY_PATH=$ORIGIN/lib because $LIB isn't univoque for integrators while lib is. Change-Id: Ic4b2f8bb1410c35f75eb957a0ebc10141f995aba Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--conf/afm-unit-debug.conf.in4
-rw-r--r--conf/afm-unit.conf.in4
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/afm-unit-debug.conf.in b/conf/afm-unit-debug.conf.in
index 2bc2959..6fbd229 100644
--- a/conf/afm-unit-debug.conf.in
+++ b/conf/afm-unit-debug.conf.in
@@ -146,6 +146,8 @@ EnvironmentFile=-/var/run/afm-debug/{{idaver}}{{^#target=main}}@{{:#target}}{{/#
%systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
{{/required-permission.urn:AGL:permission::public:hidden}}\
+Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+
;---------------------------------------------------------------------------------
;---- text/html application/vnd.agl.native application/vnd.agl.service ----
@@ -226,8 +228,6 @@ ExecStart=/usr/bin/afb-daemon \
;---------------------------------------------------------------------------------
{{#content.type=application/x-executable}}
-Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
-
ExecStart={{:#metadata.install-dir}}/{{content.src}}
{{/content.type=application/x-executable}}
diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in
index e6163e2..bcd9949 100644
--- a/conf/afm-unit.conf.in
+++ b/conf/afm-unit.conf.in
@@ -142,6 +142,8 @@ Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}
%systemd-unit service afm-appli-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}
{{/required-permission.urn:AGL:permission::public:hidden}}\
+Environment=LD_LIBRARY_PATH=$ORIGIN/lib
+
;---------------------------------------------------------------------------------
;---- text/html application/vnd.agl.native application/vnd.agl.service ----
@@ -222,8 +224,6 @@ ExecStart=/usr/bin/afb-daemon \
;---------------------------------------------------------------------------------
{{#content.type=application/x-executable}}
-Environment=LD_LIBRARY_PATH=$ORIGIN/$LIB
-
ExecStart={{:#metadata.install-dir}}/{{content.src}}
{{/content.type=application/x-executable}}