diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | conf/system/afm-system-setup.sh.in | 9 | ||||
| -rw-r--r-- | conf/unit/macros.inc | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c83e59d..4e28c8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ set(systemd_units_root "${CMAKE_INSTALL_FULL_LIBDIR}/systemd" CACHE STRING set(wgtpkg_trusted_cert_dir "${afm_confdir}/certs" CACHE STRING "Path to internal certificates") set(afm_platform_rundir "/run/platform" CACHE STRING "Path to location of platform runtime sockets") set(afm_users_rundir "/run/user" CACHE STRING "Path to location of users runtime sockets") +set(afm_scope_platform_dir "/var/scope-platform" CACHE STRING "Path to home of scope-platform apps") if(USE_SIMULATION) set(SIMULATE_SECMGR ON) diff --git a/conf/system/afm-system-setup.sh.in b/conf/system/afm-system-setup.sh.in index 4da558e..c3f827e 100644 --- a/conf/system/afm-system-setup.sh.in +++ b/conf/system/afm-system-setup.sh.in @@ -5,7 +5,7 @@ pdir=@afm_platform_rundir@ dodir() { if ! test -e $1; then mkdir -m 755 $1 - chsmack -a '*' $1 + chsmack -a '*' -T $1 fi } @@ -14,3 +14,10 @@ dodir $pdir/display dodir $pdir/apis dodir $pdir/apis/ws @create_platform_debug@ + +spdir=@afm_scope_platform_dir@ +if ! test -e $spdir; then + mkdir -m 755 $spdir + chsmack -a '*' -T $spdir + chown daemon:daemon $spdir +fi diff --git a/conf/unit/macros.inc b/conf/unit/macros.inc index ca72b95..30322cb 100644 --- a/conf/unit/macros.inc +++ b/conf/unit/macros.inc @@ -59,8 +59,8 @@ define( `USER_RUN_DIR', `@afm_users_rundir@/%i') define( `DEBUGGING_DIR', `@afm_platform_rundir@/debug') define( `PLATFORM_RUN_DIR', `@afm_platform_rundir@') -define( `APP_DATA_DIR', `ON_PERM(`:partner:scope-platform', `/tmp', `/home/%i/app-data')') -define( `APP_WORK_DIR', `ON_PERM(`:partner:scope-platform', `/tmp', `APP_DATA_DIR/{{:id}}')') +define( `APP_DATA_DIR', `ON_PERM(`:partner:scope-platform', `@afm_scope_platform_dir@', `/home/%i/app-data')') +define( `APP_WORK_DIR', `APP_DATA_DIR/{{:id}}') define( `RUN_DIR', `ON_PERM(`:partner:scope-platform', `PLATFORM_RUN_DIR', `USER_RUN_DIR')') define( `API_PATH', `RUN_DIR/apis') |