From ab88c4c85be6dbbe31489534462c53b5c2a0fb50 Mon Sep 17 00:00:00 2001 From: jobol Date: Thu, 7 Dec 2017 16:49:03 +0100 Subject: unit.cont: Refactor PATH and LD_LIBRARY_PATH Change-Id: Ic6da02c0039421fd5656238f5fa812574af1c268 Signed-off-by: jobol --- conf/unit/generate-unit-conf/service.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf/unit/generate-unit-conf') diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc index a860360..0d784da 100644 --- a/conf/unit/generate-unit-conf/service.inc +++ b/conf/unit/generate-unit-conf/service.inc @@ -75,13 +75,13 @@ ON_PERM(:public:syscall:clock, , SystemCallFilter=~@clock) WorkingDirectory=-APP_DATA_DIR/{{:id}} ExecStartPre=/bin/mkdir -p APP_DATA_DIR/{{:id}} Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}} -Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}} +Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}}/bin +Environment=LD_LIBRARY_PATH={{:#metadata.install-dir}}/lib Environment=XDG_DATA_HOME=APP_DATA_DIR/{{:id}} Environment=XDG_CONFIG_HOME=APP_DATA_DIR/{{:id}} Environment=XDG_CACHE_HOME=APP_DATA_DIR/{{:id}} Environment=XDG_RUNTIME_DIR=/run/user/%i Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%i/bus -Environment=LD_LIBRARY_PATH=$ORIGIN/lib IF_AGL_DEVEL ; Needed to enable debug -- cgit 1.2.3-korg