From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 20 Aug 2019 08:08:39 +0000 (+0000)
Subject: Revert "tizen: Add additional unit for "unified" user session"
X-Git-Tag: submit/tizen/20190820.090809^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ad3d47e655303e0824e4ce0098486599e8a5c7f;p=platform%2Fadaptation%2Fsystem-plugin.git

Revert "tizen: Add additional unit for "unified" user session"

This reverts commit 99515ebe8cbc4752ac29c0c69c074ffad29c67ee.

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

Change-Id: I10f68186ee4f08ebf30a215ead7d943300311b09
---

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 96cae2c..b076f2d 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -231,10 +231,6 @@ mkdir -p %{buildroot}%{_userunitdir}/basic.target.wants
 install -m 644 units/session-bind.service %{buildroot}%{_userunitdir}
 ln -s ../session-bind.service %{buildroot}%{_userunitdir}/basic.target.wants/session-bind.service
 
-mkdir -p %{buildroot}%{_unitdir}/user-basic@.target.wants
-install -m 644 units/session-bind@.service %{buildroot}%{_unitdir}
-ln -s ../session-bind@.service %{buildroot}%{_unitdir}/user-basic@.target.wants/session-bind@.service
-
 %clean
 rm -rf %{buildroot}
 
@@ -336,8 +332,6 @@ rm -f %{_sbindir}/e4crypt
 %{_bindir}/session-bind
 %{_userunitdir}/session-bind.service
 %{_userunitdir}/basic.target.wants/session-bind.service
-%{_unitdir}/session-bind@.service
-%{_unitdir}/user-basic@.target.wants/session-bind@.service
 
 %post feature-session-bind
 echo ""
diff --git a/units/session-bind@.service b/units/session-bind@.service
deleted file mode 100644
index bb3e805..0000000
--- a/units/session-bind@.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=User session bind mount for %i
-Wants=wait-mount@opt-usr.service
-After=wait-mount@opt-usr.service
-ConditionPathIsMountPoint=!/opt/usr/apps
-ConditionPathIsMountPoint=!/opt/usr/media
-
-[Service]
-User=%i
-SmackProcessLabel=User
-Capabilities=cap_sys_admin=i
-SecureBits=keep-caps
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/session-bind