diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-11-16 12:51:41 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-11-24 17:44:57 +0100 |
| commit | 971d4e96d6b14c01e8eae4f6e9910bc5859adfb1 (patch) | |
| tree | 024429c7f1ceebecfc5e25d868e8e1e8881750e0 /conf/afm-unit.conf.in | |
| parent | 1867d049f8a3b181bb920fef6d904cfa67de06f0 (diff) | |
wgtpkg-unit: remove metadata.app-data-dir variable
Change-Id: I51cbbad8ecdc371f457a008808c8c0f63501ac2b
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf/afm-unit.conf.in')
| -rw-r--r-- | conf/afm-unit.conf.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/conf/afm-unit.conf.in b/conf/afm-unit.conf.in index 8ccf861..d0b60fa 100644 --- a/conf/afm-unit.conf.in +++ b/conf/afm-unit.conf.in @@ -106,7 +106,7 @@ X-AFM--target-name={{:#target}} X-AFM--content={{content.src}} X-AFM--type={{content.type}} X-AFM--wgtdir={{:#metadata.install-dir}} -X-AFM--workdir={{&#metadata.app-data-dir}}/{{:id}} +X-AFM--workdir=/home/%i/app-data/{{:id}} %nl Wants=sockets.target # Adds check to smack @@ -134,13 +134,13 @@ AmbientCapabilities= {{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}} {{^required-permission.urn:AGL:permission::public:syscall:clock}}SystemCallFilter=~@clock{{/required-permission.urn:AGL:permission::public:syscall:clock}} %nl -WorkingDirectory=-{{&#metadata.app-data-dir}}/{{:id}} -ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{:id}} +WorkingDirectory=-/home/%i/app-data/{{:id}} +ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}} Environment=AFM_APP_INSTALL_DIR={{:#metadata.install-dir}} Environment=PATH=/usr/sbin:/usr/bin:/sbin:/bin:{{:#metadata.install-dir}} -Environment=XDG_DATA_HOME={{&#metadata.app-data-dir}}/{{:id}} -Environment=XDG_CONFIG_HOME={{&#metadata.app-data-dir}}/{{:id}} -Environment=XDG_CACHE_HOME={{&#metadata.app-data-dir}}/{{:id}} +Environment=XDG_DATA_HOME=/home/%i/app-data/{{:id}} +Environment=XDG_CONFIG_HOME=/home/%i/app-data/{{:id}} +Environment=XDG_CACHE_HOME=/home/%i/app-data/{{: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 @@ -160,7 +160,7 @@ X-AFM--http-port={{:#metadata.http-port}} ExecStart=/usr/bin/afb-daemon \ --name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \ --rootdir={{:#metadata.install-dir}} \ - --workdir={{&#metadata.app-data-dir}}/{{id}} \ + --workdir=/home/%i/app-data/{{id}} \ {{#content.type=application/vnd.agl.service}} \ --no-httpd \ {{/content.type=application/vnd.agl.service}}{{^content.type=application/vnd.agl.service}} \ |