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/generate-unit-conf | |
| 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/generate-unit-conf')
| -rw-r--r-- | conf/generate-unit-conf/afm-unit | 1 | ||||
| -rw-r--r-- | conf/generate-unit-conf/binder.inc | 2 | ||||
| -rw-r--r-- | conf/generate-unit-conf/service.inc | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/conf/generate-unit-conf/afm-unit b/conf/generate-unit-conf/afm-unit index e3abf19..58fe851 100644 --- a/conf/generate-unit-conf/afm-unit +++ b/conf/generate-unit-conf/afm-unit @@ -46,6 +46,7 @@ define( `TARGET', `{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}}') define( `UNIT_NAME_BASE', `afm-ON_PERM(`:public:hidden', `service', `appli')-{{:id}}--{{:ver}}--{{:#target}}') define( `UNIT_NAME_SERVICE', `UNIT_NAME_BASE%i.service') define( `UNIT_NAME_SOCKET_FOR', `afm-api-ws-$1@%i.socket') +define( `APP_DATA_DIR', `/home/%i/app-data') ----------------------------------------------------------------------- -- diff --git a/conf/generate-unit-conf/binder.inc b/conf/generate-unit-conf/binder.inc index a99467a..48915c0 100644 --- a/conf/generate-unit-conf/binder.inc +++ b/conf/generate-unit-conf/binder.inc @@ -10,7 +10,7 @@ ENDIF ExecStart=/usr/bin/afb-daemon \ --name afbd-TARGET \ --rootdir={{:#metadata.install-dir}} \ - --workdir={{&#metadata.app-data-dir}}/{{id}} \ + --workdir=APP_DATA_DIR/{{id}} \ IF_AGL_DEVEL \ --verbose \ --verbose \ diff --git a/conf/generate-unit-conf/service.inc b/conf/generate-unit-conf/service.inc index 040eb16..be1f7aa 100644 --- a/conf/generate-unit-conf/service.inc +++ b/conf/generate-unit-conf/service.inc @@ -30,7 +30,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=APP_DATA_DIR/{{:id}} %nl Wants=sockets.target @@ -66,13 +66,13 @@ ON_PERM(:public:display, SupplementaryGroups=display) ON_PERM(:public:syscall:clock, , SystemCallFilter=~@clock) %nl -WorkingDirectory=-{{&#metadata.app-data-dir}}/{{:id}} -ExecStartPre=/bin/mkdir -p {{&#metadata.app-data-dir}}/{{:id}} +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=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=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 |