Rework on systemd start of user sessions

[src/app-framework-main.git] / conf / unit / generate-unit-conf / service.inc

diff --git a/conf/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc
similarity index 95%
rename from conf/generate-unit-conf/service.inc
rename to conf/unit/generate-unit-conf/service.inc
index 7e8dd40..ac10f97 100644 (file)
--- a/conf/generate-unit-conf/service.inc
+++ b/conf/unit/generate-unit-conf/service.inc
@@ -7,6 +7,9 @@ dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
 # auto generated by wgtpkg-unit for {{:id}} version {{:version}} target {{:#target}} of {{:idaver}}
 %nl
 
+%systemd-unit system
+%systemd-unit service UNIT_NAME_BASE
+
 [Unit]
 Description={{description}}
 X-AFM-description={{description}}
@@ -29,7 +32,8 @@ X-AFM--wgtdir={{:#metadata.install-dir}}
 X-AFM--workdir=APP_DATA_DIR/{{:id}}
 %nl
 
-Wants=sockets.target
+Wants=afm-user-session@%i.target
+After=afm-user-setup@%i.service
 
 # Adds check to smack
 ConditionSecurity=smack
@@ -49,7 +53,6 @@ EnvironmentFile=-AFM_CONFIG_DIR/unit.env.d/*
 SmackProcessLabel=User::App::{{:id}}
 SuccessExitStatus=0 SIGKILL
 
-#PAMName=su
 User=%i
 Slice=user-%i.slice
 
@@ -79,9 +82,6 @@ Environment=AFM_ID=TARGET
 EnvironmentFile=-/var/run/afm-debug/TARGET.env
 ENDIF
 
-%systemd-unit system
-%systemd-unit service UNIT_NAME_BASE
-
 SyslogIdentifier=afbd-TARGET
 StandardInput=null
 StandardOutput=journal
@@ -106,8 +106,8 @@ IF_PERM(:system:run-by-default)
 ; auto start
 ;---------------------------------------------------------------------------------
 [Install]
-WantedBy=default.target
-%systemd-unit wanted-by agl-user-session@.service
+WantedBy=agl-user-session@.target
+%systemd-unit wanted-by agl-user-session@.target
 ENDIF
 
 %end systemd-unit