X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Funit%2Fgenerate-unit-conf%2Fservice.inc;h=dd585d557dd061944a626ed50648b8da3fa6d33d;hb=07a9590a2dfcfd18540bbb67e2fbc2fc1795e4fa;hp=5b146ee748941704d15e4651298b165b7c44ec51;hpb=73f3570165a3c5303ae54ff71aadbf2638fd59c7;p=src%2Fapp-framework-main.git diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc index 5b146ee..dd585d5 100644 --- a/conf/unit/generate-unit-conf/service.inc +++ b/conf/unit/generate-unit-conf/service.inc @@ -30,6 +30,7 @@ X-AFM--content={{content.src}} X-AFM--type={{content.type}} X-AFM--wgtdir={{:#metadata.install-dir}} X-AFM--workdir=APP_DATA_DIR/{{:id}} +X-AFM--visibility=ON_PERM(`:public:hidden', `hidden', `visible') %nl Requires=afm-user-session@%i.target @@ -63,14 +64,15 @@ After=UNIT_NAME_API_SOCKET({{name}},%i) %nl [Service] -EnvironmentFile=-AFM_CONFIG_DIR/unit.env.d/* +EnvironmentFile=-@afm_confdir@/unit.env.d/* +EnvironmentFile=-@afm_confdir@/widget.env.d/{{:id}}/* SmackProcessLabel=User::App::{{:id}} SuccessExitStatus=0 SIGKILL User=%i Slice=user-%i.slice -#CapabilityBoundingSet= +CapabilityBoundingSet= #AmbientCapabilities= ON_PERM(:platform:no-oom, OOMScoreAdjust=-500) @@ -81,7 +83,10 @@ ON_PERM(:public:syscall:clock, , SystemCallFilter=~@clock) WorkingDirectory=-APP_DATA_DIR/{{:id}} ExecStartPre=/bin/mkdir -p APP_DATA_DIR/{{:id}} +Environment=AFM_ID=TARGET Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}} +Environment=AFM_WORKDIR=APP_DATA_DIR/{{:id}} +Environment=AFM_WSAPI_DIR=API_PATH_WS 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}} @@ -92,7 +97,6 @@ Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=USER_RUN_DIR/bus IF_AGL_DEVEL ; Needed to enable debug -Environment=AFM_ID=TARGET EnvironmentFile=-DEBUGGING_DIR/TARGET.env ENDIF