From db8968de9b88e75828475c1e26b657af21b75beb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Fri, 24 Nov 2017 09:33:43 +0100 Subject: [PATCH] Improve afm-user-session setup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I4dfb0939afc871e93874cf021548db2e85d3656c Signed-off-by: José Bollo --- conf/system/afm-user-session@.service | 8 ++------ conf/system/afm-user-setup@.service | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/conf/system/afm-user-session@.service b/conf/system/afm-user-session@.service index 83ae24f..fae3e46 100644 --- a/conf/system/afm-user-session@.service +++ b/conf/system/afm-user-session@.service @@ -1,15 +1,11 @@ [Unit] Description=Initiate afm-user-session %i +Requires=systemd-user-sessions.service After=systemd-user-sessions.service -Wants=afm-user-setup@%i.service -Before=afm-user-setup@%i.service -Wants=afm-user-session@%i.target +Requires=afm-user-session@%i.target Before=afm-user-session@%i.target [Service] PAMName=afm-user-session User=%i Type=simple -ExecStartPre=/bin/echo START afm-user-session@%i ExecStart=/bin/sleep 2147483648 -ExecStop=/bin/echo STOP afm-user-session@%i -RemainAfterExit=yes diff --git a/conf/system/afm-user-setup@.service b/conf/system/afm-user-setup@.service index 050a33a..5d99d2d 100644 --- a/conf/system/afm-user-setup@.service +++ b/conf/system/afm-user-setup@.service @@ -4,10 +4,8 @@ Requires=afm-user-setup@%i.path After=afm-user-setup@%i.path Requires=afm-user-session@%i.service After=afm-user-session@%i.service -Before=afm-user-session@%i.target [Service] -User=%i Type=oneshot -ExecStart=/bin/rm /run/user/%i/afm-user-started +ExecStart=/bin/echo Complete setup of afm-user-session %i -- 2.16.6