From c912cbe6b33ba30309388719316775e5fc44555a Mon Sep 17 00:00:00 2001
From: Mateusz Moscicki <m.moscicki2@partner.samsung.com>
Date: Fri, 19 Apr 2019 13:54:17 +0200
Subject: [PATCH] tizen: Add additional unit for "unified" user session

The unified user session is about moving user session units, managed by
systemd --user, to main systemd, where it's managed as part of newly
created user@.target.

user@.target will contain same units as previously available in user/,
with same UID and environment setup.  systemd instance is used for unit
to be able to specify UID (inherited from user@.target).

The rationale behind this work is following:

* VD requirement to remove user session support
* boot time optimization requirements, due to:

   + 'systemd --user' taking 1s its own startup that could be used for
     unit startup
   + ability to better rearrange units if these managed by one systemd
     instance

Unit installed by this commit will not be used till user login mechanism
will be changed in systemd package (via changing pam_systemd to start
user@.target, rather than user@.service).

Change-Id: I86da33a05560b73c44c39c073f4ac6ca11fd6e86
---
 packaging/libtdm.spec            | 10 ++++++++++
 service/tdm-socket-user@.path    |  9 +++++++++
 service/tdm-socket-user@.service | 15 +++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 service/tdm-socket-user@.path
 create mode 100644 service/tdm-socket-user@.service

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index 3188c89..cb3c0c8 100644
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -98,6 +98,10 @@ rm -rf %{buildroot}
 install -m 644 service/tdm-socket-user.service %{buildroot}%{_unitdir_user}
 install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
 
+%__mkdir_p %{buildroot}%{_unitdir}
+install -m 644 service/tdm-socket-user@.service %{buildroot}%{_unitdir}
+install -m 644 service/tdm-socket-user@.path %{buildroot}%{_unitdir}
+
 %remove_docs
 
 
@@ -105,9 +109,13 @@ install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
 %__mkdir_p %{_unitdir_user}/basic.target.wants
 ln -sf ../tdm-socket-user.path %{_unitdir_user}/basic.target.wants/
 
+%__mkdir_p %{_unitdir}/user-basic@.target.wants
+ln -sf ../tdm-socket-user@.path %{_unitdir}/user-basic@.target.wants/
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
+rm -f %{_unitdir}/user-basic@.target.wants/tdm-socket-user@.path
 
 %files
 %manifest %{name}.manifest
@@ -119,6 +127,8 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %attr(750,root,root) %{_bindir}/tdm-monitor
 %{_unitdir_user}/tdm-socket-user.path
 %{_unitdir_user}/tdm-socket-user.service
+%{_unitdir}/tdm-socket-user@.path
+%{_unitdir}/tdm-socket-user@.service
 
 %files devel
 %manifest %{name}.manifest
diff --git a/service/tdm-socket-user@.path b/service/tdm-socket-user@.path
new file mode 100644
index 0000000..e71810c
--- /dev/null
+++ b/service/tdm-socket-user@.path
@@ -0,0 +1,9 @@
+[Unit]
+PartOf=userlogin@%i.target
+DefaultDependencies=no
+After=systemd-logind.service
+After=systemd-logind.service systemd-logind.service
+Description=Wait for tdm-socket
+
+[Path]
+PathExists=/run/tdm-socket
diff --git a/service/tdm-socket-user@.service b/service/tdm-socket-user@.service
new file mode 100644
index 0000000..4fca44d
--- /dev/null
+++ b/service/tdm-socket-user@.service
@@ -0,0 +1,15 @@
+[Unit]
+PartOf=userlogin@%i.target
+After=systemd-logind.service
+After=display-manager.service systemd-logind.service
+Description=Creating a link file for user to access tdm-socket
+DefaultDependencies=no
+Before=starter@%i.service
+
+[Service]
+User=%i
+Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus
+Environment=XDG_RUNTIME_DIR=/run/user/%i
+SmackProcessLabel=User
+Type=oneshot
+ExecStart=/usr/bin/sh -c "while [ ! -e /run/tdm-socket ] ; do /usr/bin/sleep .1 ; done ;/usr/bin/ln -s /run/tdm-socket /run/user/%i/"
-- 
2.7.4