From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 20 Aug 2019 07:03:04 +0000 (+0000)
Subject: Revert "tizen: Add additional unit for "unified" user session"
X-Git-Tag: submit/tizen/20190821.105032~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F212300%2F3;p=platform%2Fcore%2Fcontext%2Fcontext-service.git

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

This reverts commit 4643f56973dda0d0555206b3b4028967eab1127e.

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

Change-Id: I5f5a75a214b86200247dc94796d131b10884c1af
---

diff --git a/packaging/context-service.spec b/packaging/context-service.spec
index 454707b..24de18a 100644
--- a/packaging/context-service.spec
+++ b/packaging/context-service.spec
@@ -9,8 +9,6 @@ Source1:	contextd.service
 Source2:	org.tizen.context.conf
 Source3:	contextd-agent.service
 Source4:	contextd-agent.socket
-Source5:	contextd-agent@.service
-Source6:	contextd-agent@.socket
 
 %define upgrade_script_path /usr/share/upgrade/scripts
 
@@ -72,11 +70,6 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_unitdir_user}
 install -m 0644 %{SOURCE4} %{buildroot}%{_unitdir_user}
 ln -s ../contextd-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/contextd-agent.socket
 
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
-install -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}
-install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}
-ln -s ../contextd-agent@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/contextd-agent@.socket
-
 mkdir -p %{buildroot}%{upgrade_script_path}
 cp -f scripts/500.context-service.sh %{buildroot}%{upgrade_script_path}
 
@@ -95,7 +88,4 @@ cp -f scripts/500.context-service.sh %{buildroot}%{upgrade_script_path}
 %{_unitdir_user}/contextd-agent.service
 %{_unitdir_user}/contextd-agent.socket
 %{_unitdir_user}/*/contextd-agent.socket
-%{_unitdir}/contextd-agent@.service
-%{_unitdir}/contextd-agent@.socket
-%{_unitdir}/*/contextd-agent@.socket
 %license LICENSE
diff --git a/packaging/contextd-agent@.service b/packaging/contextd-agent@.service
deleted file mode 100644
index bcca3a1..0000000
--- a/packaging/contextd-agent@.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Contextual Service Framework User-Level Agent Daemon
-
-[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=notify
-ExecStart=/usr/bin/contextd-agent
-Restart=no
-
-[Install]
-WantedBy=user-sockets@.target
diff --git a/packaging/contextd-agent@.socket b/packaging/contextd-agent@.socket
deleted file mode 100644
index f7373c0..0000000
--- a/packaging/contextd-agent@.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=Context-Agent Socket
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/user/%i/system_share/.contextd-agent.socket