From ae33f9100e3b67a8ce07e5ad8b1f0ee73867df6a Mon Sep 17 00:00:00 2001
From: José Bollo <jose.bollo@iot.bzh>
Date: Wed, 28 Feb 2018 20:07:23 +0100
Subject: Refactor user session management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ib6ba886df110d8a23e3760e1818263ec757b9c7c
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 conf/system/CMakeLists.txt               |  3 ++-
 conf/system/afm-system-daemon.service.in |  1 +
 conf/system/afm-system-setup.service     | 12 ++++++------
 conf/system/afm-user-session@.service    |  2 +-
 conf/system/afm-user-setup@.service      | 11 +++++++----
 5 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'conf/system')

diff --git a/conf/system/CMakeLists.txt b/conf/system/CMakeLists.txt
index 2f1b209..c36128f 100644
--- a/conf/system/CMakeLists.txt
+++ b/conf/system/CMakeLists.txt
@@ -32,9 +32,10 @@ if(NOT USE_SDK)
 		FILES
 			${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service
 			${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket
-			${CMAKE_CURRENT_SOURCE_DIR}/afm-system-daemon.conf
+			${CMAKE_CURRENT_SOURCE_DIR}/afm-system-setup.service
 			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.service
 			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.target
+			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-setup@.service
 		DESTINATION
 			${UNITDIR_SYSTEM}
 	)
diff --git a/conf/system/afm-system-daemon.service.in b/conf/system/afm-system-daemon.service.in
index ca4ca1d..593f007 100644
--- a/conf/system/afm-system-daemon.service.in
+++ b/conf/system/afm-system-daemon.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Application Framework Master, system side
+Require=afm-system-setup.service
 
 [Service]
 #User=afm
diff --git a/conf/system/afm-system-setup.service b/conf/system/afm-system-setup.service
index 260975c..d624aeb 100644
--- a/conf/system/afm-system-setup.service
+++ b/conf/system/afm-system-setup.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Initiate afm-system-setup
-Before=weston.service
+Before=weston.service afs-supervisor.service afm-system-daemon.service
 [Service]
-Type=one-shot
-ExecStart=-/bin/sh -c "/bin/mkdir -m 755 -Z '*' /run/platform"
-ExecStart=-/bin/sh -c "/bin/mkdir -m 755 -Z '*' /run/platform/display"
-ExecStart=-/bin/sh -c "/bin/mkdir -m 755 -Z '*' /run/platform/apis"
-ExecStart=-/bin/sh -c "/bin/mkdir -m 755 -Z '*' /run/platform/apis/ws"
+Type=oneshot
+ExecStart=-/bin/sh -c "/bin/mkdir -m 755 /run/platform; /usr/bin/chsmack -a '*' /run/platform"
+ExecStart=-/bin/sh -c "/bin/mkdir -m 755 /run/platform/display; /usr/bin/chsmack -a '*' /run/platform/display"
+ExecStart=-/bin/sh -c "/bin/mkdir -m 755 /run/platform/apis; /usr/bin/chsmack -a '*' /run/platform/apis"
+ExecStart=-/bin/sh -c "/bin/mkdir -m 755 /run/platform/apis/ws; /usr/bin/chsmack -a '*' /run/platform/apis/ws"
diff --git a/conf/system/afm-user-session@.service b/conf/system/afm-user-session@.service
index 5bedf94..93f9d86 100644
--- a/conf/system/afm-user-session@.service
+++ b/conf/system/afm-user-session@.service
@@ -5,4 +5,4 @@ After=systemd-user-sessions.service
 [Service]
 User=%i
 PAMName=afm-user-session
-ExecStart=/bin/systemctl --wait start afm-user-session@%i.target
+ExecStart=/usr/bin/afm-user-session
diff --git a/conf/system/afm-user-setup@.service b/conf/system/afm-user-setup@.service
index 2cc4214..40c3427 100644
--- a/conf/system/afm-user-setup@.service
+++ b/conf/system/afm-user-setup@.service
@@ -2,7 +2,10 @@
 Description=Initiate afm-user-setup %i
 After=user@%i.service
 [Service]
-Type=one-shot
-ExecStart=-/bin/sh -c "/bin/mkdir -Z '*' /run/user/%i && /bin/chown %i:%i /run/user/%i"
-ExecStart=-/bin/sh -c "/bin/mkdir -Z '*' /run/user/%i/apis && /bin/chown %i:%i /run/user/%i/apis"
-ExecStart=-/bin/sh -c "/bin/mkdir -Z '*' /run/user/%i/apis/ws && /bin/chown %i:%i /run/user/%i/apis/ws"
+Type=oneshot
+ExecStart=-/bin/sh -c "/bin/mkdir /run/user/%i; /bin/chown %i:%i /run/user/%i; /usr/bin/chsmack -a '*' /run/user/%i"
+ExecStart=-/bin/sh -c "/bin/mkdir /run/user/%i/apis; /bin/chown %i:%i /run/user/%i/apis; /usr/bin/chsmack -a '*' /run/user/%i/apis"
+ExecStart=-/bin/sh -c "/bin/mkdir /run/user/%i/apis/ws; /bin/chown %i:%i /run/user/%i/apis/ws; /usr/bin/chsmack -a '*' /run/user/%i/apis/ws"
+ExecStart=-/bin/sh -c "/bin/ln -sf /run/platform/display/wayland-0 /run/user/%i/wayland-0; /bin/chown %i:%i /run/user/%i/wayland-0; /usr/bin/chsmack -a '*' /run/user/%i/wayland-0"
+
+
-- 
cgit 1.2.3-korg