X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=conf%2Funit%2Fgenerate-unit-conf%2Fservice.inc;h=fdafc5c6552a98d63d281231296d8e3c6ec052bd;hb=20bf07791d69cd25b73139379ccb8947c5f1b2f7;hp=1df421024fbcc6b6dd6ba9a3b3975aba7222fb24;hpb=6caade489f8bd15dccdde6c69452d920ead2201e;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 1df4210..fdafc5c 100644 --- a/conf/unit/generate-unit-conf/service.inc +++ b/conf/unit/generate-unit-conf/service.inc @@ -30,10 +30,12 @@ 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 After=user@%i.service +After=Network.target # Adds check to smack ConditionSecurity=smack @@ -63,6 +65,7 @@ After=UNIT_NAME_API_SOCKET({{name}},%i) [Service] EnvironmentFile=-AFM_CONFIG_DIR/unit.env.d/* +EnvironmentFile=-AFM_CONFIG_DIR/widget.env.d/{{:id}}/* SmackProcessLabel=User::App::{{:id}} SuccessExitStatus=0 SIGKILL @@ -80,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}} @@ -91,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