4 files changed, 11 insertions, 40 deletions
diff --git a/recipes-config/agl-session/agl-container-guest/agl-session@.service b/recipes-config/agl-session/agl-container-guest/agl-session@.service
deleted file mode 100644
index 213d88c6..00000000
--- a/recipes-config/agl-session/agl-container-guest/agl-session@.service
+++ /dev/null
@@ -1,24 +0,0 @@
-[Unit]
-Description=AGL user session
-After=systemd-user-sessions.service
-Wants=dbus.socket
-After=dbus.socket
-After=session-c1.scope
-Before=multi-user.target
-
-[Service]
-Environment=XDG_SESSION_TYPE=wayland
-ExecStart=/bin/systemctl --wait --user start agl-session.target
-TimeoutStartSec=30
-# This is a template service, instantiate for desired user's name or uid
-User=%i
-PAMName=login
-WorkingDirectory=~
-StandardInput=null
-StandardOutput=journal
-StandardError=journal
-Restart=always
-RestartSec=3s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-config/agl-session/agl-session_agl-container-guest-demo.inc b/recipes-config/agl-session/agl-session_agl-container-guest-demo.inc
deleted file mode 100644
index 94a0b900..00000000
--- a/recipes-config/agl-session/agl-session_agl-container-guest-demo.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/agl-container-guest:"
-
-# Allow input device for agl-driver
-GROUPADD_PARAM:${PN} = "\
-	--system display ; \
-	--system video ; \
-	--system input ; \
-	--system pipewire ; \
-	-g 1001 agl-driver ; \
-	-g 1003 applaunchd ; \
-"
-USERADD_PARAM:${PN} = "\
-  -g 1001 -u 1001 -G video,input,display,pipewire,applaunchd -o -d /home/agl-driver -m -K PASS_MAX_DAYS=-1 agl-driver ; \
-  -g 1003 -u 1003 -o -d / -K PASS_MAX_DAYS=-1 applaunchd ; \
-"
diff --git a/recipes-config/agl-session/agl-session_%.bbappend b/recipes-config/agl-users/agl-users_%.bbappend
index 118b8176..7ed894f0 100644
--- a/recipes-config/agl-session/agl-session_%.bbappend
+++ b/recipes-config/agl-users/agl-users_%.bbappend
@@ -1 +1 @@
-require ${@bb.utils.contains('AGL_FEATURES', 'agl-container-guest-demo', 'agl-session_agl-container-guest-demo.inc', '', d)}
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-container-guest-demo', 'agl-users_agl-container-guest-demo.inc', '', d)}
diff --git a/recipes-config/agl-users/agl-users_agl-container-guest-demo.inc b/recipes-config/agl-users/agl-users_agl-container-guest-demo.inc
new file mode 100644
index 00000000..cb21d079
--- /dev/null
+++ b/recipes-config/agl-users/agl-users_agl-container-guest-demo.inc
@@ -0,0 +1,10 @@
+# Allow input device for agl-driver
+GROUPADD_PARAM:${PN} = "\
+	--system video ; \
+	--system input ; \
+	--system pipewire ; \
+	-g 1001 agl-driver ; \
+"
+USERADD_PARAM:${PN} = "\
+  -g 1001 -u 1001 -G video,input,pipewire -o -d /home/agl-driver -m -K PASS_MAX_DAYS=-1 agl-driver ; \
+"