5 files changed, 4 insertions, 29 deletions
diff --git a/conf/system/CMakeLists.txt b/conf/system/CMakeLists.txt
index d0605eb..74fdf37 100644
--- a/conf/system/CMakeLists.txt
+++ b/conf/system/CMakeLists.txt
@@ -35,8 +35,6 @@ if(NOT USE_SDK)
 			${CMAKE_CURRENT_SOURCE_DIR}/afm-system-daemon.conf
 			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.service
 			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.target
-			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-setup@.path
-			${CMAKE_CURRENT_SOURCE_DIR}/afm-user-setup@.service
 		DESTINATION
 			${UNITDIR_SYSTEM}
 	)
diff --git a/conf/system/afm-user-session@.service b/conf/system/afm-user-session@.service
index fae3e46..5bedf94 100644
--- a/conf/system/afm-user-session@.service
+++ b/conf/system/afm-user-session@.service
@@ -2,10 +2,7 @@
 Description=Initiate afm-user-session %i
 Requires=systemd-user-sessions.service
 After=systemd-user-sessions.service
-Requires=afm-user-session@%i.target
-Before=afm-user-session@%i.target
 [Service]
-PAMName=afm-user-session
 User=%i
-Type=simple
-ExecStart=/bin/sleep 2147483648
+PAMName=afm-user-session
+ExecStart=/bin/systemctl --wait start afm-user-session@%i.target
diff --git a/conf/system/afm-user-session@.target b/conf/system/afm-user-session@.target
index 23bebfd..9503de1 100644
--- a/conf/system/afm-user-session@.target
+++ b/conf/system/afm-user-session@.target
@@ -1,4 +1,3 @@
 [Unit]
-Description=Target group of afm-user-session %i
-Requires=afm-user-setup@%i.service
-After=afm-user-setup@%i.service
+Description=afm-user-session %i
+After=user@%i.service
diff --git a/conf/system/afm-user-setup@.path b/conf/system/afm-user-setup@.path
deleted file mode 100644
index ca22c71..0000000
--- a/conf/system/afm-user-setup@.path
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Path for setup completion of afm-user-session %i
-DefaultDependencies=false
-[Path]
-PathExists=/run/user/%i/wayland-0
-PathExists=/run/user/%i/afm-user-started
-
-
diff --git a/conf/system/afm-user-setup@.service b/conf/system/afm-user-setup@.service
deleted file mode 100644
index 5d99d2d..0000000
--- a/conf/system/afm-user-setup@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Setup completion of afm-user-session %i
-Requires=afm-user-setup@%i.path
-After=afm-user-setup@%i.path
-Requires=afm-user-session@%i.service
-After=afm-user-session@%i.service
-[Service]
-Type=oneshot
-ExecStart=/bin/echo Complete setup of afm-user-session %i
-
-