From: Roger Zanoni <rzanoni@igalia.com>
Date: Mon, 31 Jul 2023 08:40:07 +0000 (+0200)
Subject: [wam][cef] Fix wam user and working directory
X-Git-Tag: 16.91.1~33
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=9ee5b5b2186752d898fca40e9178226c60b495ad

[wam][cef] Fix wam user and working directory

The WAM service needs to run with the correct user and proper working
directory set to be able to find the nssdb containing the kuksa.val
certificates.

Bug-AGL: SPEC-4868

Signed-off-by: Roger Zanoni <rzanoni@igalia.com>
Change-Id: I22fb5281b4f331d671fba79645435e5357bbca3e
---

diff --git a/recipes-wam/wam/files/WebAppMgr.env b/recipes-wam/wam/files/WebAppMgr.env
index 7737d784a..f1d0f28f7 100644
--- a/recipes-wam/wam/files/WebAppMgr.env
+++ b/recipes-wam/wam/files/WebAppMgr.env
@@ -64,7 +64,7 @@ ENABLE_LAUNCH_OPTIMIZATION=1
 NETWORK_STABLE_TIMEOUT=3
 
 WAM_SWITCHES="\
-  --user-data-dir=\"$WAM_DATA_PATH\" \
+  --user-data-dir=$WAM_DATA_PATH \
   --use-gl=egl \
   --enable-features=UseOzonePlatform \
   --ozone-platform=wayland \
diff --git a/recipes-wam/wam/files/WebAppMgr.service b/recipes-wam/wam/files/WebAppMgr.service
index ed15040fb..5f025a18e 100644
--- a/recipes-wam/wam/files/WebAppMgr.service
+++ b/recipes-wam/wam/files/WebAppMgr.service
@@ -12,12 +12,14 @@
 
 [Unit]
 Description="WebAppMgr is responsible for running web apps and manage their lifecycle"
-After=agl-compositor.service
-Requires=agl-compositor.service
+After=agl-compositor.service nss-agl-driver-db.service
+Requires=agl-compositor.service nss-agl-driver-db.service
 Before=graphical.target
 BindTo=agl-compositor.service
 
 [Service]
+User=agl-driver
+WorkingDirectory=/home/agl-driver
 Type=simple
 UMask=0077
 OOMScoreAdjust=-1000