From b564ac8bf2379f3c60c64e179c5697b4391d33d8 Mon Sep 17 00:00:00 2001
From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Thu, 22 Aug 2019 02:30:29 +0000
Subject: [PATCH] Revert "tizen: Add additional unit for "unified" user
 session"

This reverts commit c912cbe6b33ba30309388719316775e5fc44555a.

We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.

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

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index dacbdee..8288f58 100644
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -98,10 +98,6 @@ 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
 
 
@@ -109,13 +105,9 @@ install -m 644 service/tdm-socket-user@.path %{buildroot}%{_unitdir}
 %__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
@@ -127,8 +119,6 @@ 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
deleted file mode 100644
index e71810c..0000000
--- a/service/tdm-socket-user@.path
+++ /dev/null
@@ -1,9 +0,0 @@
-[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
deleted file mode 100644
index 4fca44d..0000000
--- a/service/tdm-socket-user@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[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