1 files changed, 6 insertions, 16 deletions
diff --git a/meta-agl/recipes-config/agl-login-manager/agl-login-manager_0.1.bb b/meta-agl/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
index 44a4fd36a..22f52c4ec 100644
--- a/meta-agl/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
+++ b/meta-agl/recipes-config/agl-login-manager/agl-login-manager_0.1.bb
@@ -8,18 +8,14 @@ inherit agl-graphical
 SRC_URI += " \
     file://user-config.service \
     file://user-config.path \
-    file://agl-user-session.pamd \
-    file://agl-user-session@.service \
 "
 
 LOGIN_USER ??="1001 1002"
 
-do_install_append() {
+RDEPENDS_${PN} += "af-main"
 
-    install -d ${D}${sysconfdir}/pam.d/
-    install -m 0644 ${WORKDIR}/agl-user-session.pamd ${D}${sysconfdir}/pam.d/agl-user-session
+do_install_append() {
 
-    install -d ${D}${systemd_user_unitdir}
     install -d ${D}${systemd_user_unitdir}/default.target.wants
     install -m 0644 ${WORKDIR}/user-config.service ${D}${systemd_user_unitdir}
     install -m 0644 ${WORKDIR}/user-config.path ${D}${systemd_user_unitdir}
@@ -29,19 +25,13 @@ do_install_append() {
     sed -e 's,@DISPLAY_XDG_RUNTIME_DIR@,${DISPLAY_XDG_RUNTIME_DIR},g' \
         -i ${D}${systemd_user_unitdir}/user-config.path
 
-    ln -sf ${systemd_user_unitdir}/user-config.path ${D}${systemd_user_unitdir}/default.target.wants
+    ln -s ../user-config.path ${D}${systemd_user_unitdir}/default.target.wants/user-config.path
 
-    install -d ${D}${systemd_unitdir}/system/
-    install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-    install -m 0644 ${WORKDIR}/agl-user-session@.service ${D}${systemd_unitdir}/system/
+    install -d ${D}${systemd_system_unitdir}/multi-user.target.wants/
 
     for AGL_USER in ${LOGIN_USER};do
-        ln -sf ${systemd_system_unitdir}/agl-user-session@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/agl-user-session@${AGL_USER}.service;
+        ln -s ../afm-user-session@.service ${D}${systemd_system_unitdir}/multi-user.target.wants/afm-user-session@${AGL_USER}.service
     done
 }
 
-FILES_${PN} += "${sysconfdir}/pam.d/agl-user-session"
-FILES_${PN} += "${systemd_user_unitdir}/*"
-FILES_${PN} += "${libdir}/systemd/user/default.target.wants/*"
-FILES_${PN} += "${systemd_unitdir}/system/agl-user-session@.service"
-FILES_${PN} += "${systemd_unitdir}/system/multi-user.target.wants/*"
+FILES_${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir}"