From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 20 Aug 2019 07:02:23 +0000 (+0000)
Subject: Revert "tizen: Add additional unit for "unified" user session"
X-Git-Tag: submit/tizen/20190827.042247~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=125e0e2567c37c26af0916a13f930d07aa5d4b57;p=platform%2Fcore%2Fappfw%2Fslp-pkgmgr.git

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

This reverts commit c5df79346091d78b1866d047a378f35ddec6f287.

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

Change-Id: I73479c82a642c9cf5b31c4c0f49a5937b6fc3b9e
---

diff --git a/packaging/pkgmgr-installer-signal-agent@.service b/packaging/pkgmgr-installer-signal-agent@.service
deleted file mode 100644
index fa17664..0000000
--- a/packaging/pkgmgr-installer-signal-agent@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Package Manager Installer Signal Agent on User Session
-
-[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/pkgmgr-installer-signal-agent
diff --git a/packaging/pkgmgr-installer-signal-agent@.socket b/packaging/pkgmgr-installer-signal-agent@.socket
deleted file mode 100644
index 7c185e3..0000000
--- a/packaging/pkgmgr-installer-signal-agent@.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-[Socket]
-SocketUser=%i
-ListenStream=/run/pkgmgr/agent/%i
-DirectoryMode=0777
-ExecStartPost=/usr/bin/chmod 0777 /run/pkgmgr/agent/%i
-
-[Install]
-WantedBy=user-sockets@.target
diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
index 7da95d8..5f78801 100644
--- a/packaging/pkgmgr.spec
+++ b/packaging/pkgmgr.spec
@@ -14,8 +14,6 @@ Source1006: %{name}-types-devel.manifest
 Source1007: %{name}.conf
 Source1008: %{name}-installer-signal-agent.service
 Source1009: %{name}-installer-signal-agent.socket
-Source1010: %{name}-installer-signal-agent@.service
-Source1011: %{name}-installer-signal-agent@.socket
 Requires(post): /usr/sbin/useradd
 Requires(post): capi-system-info
 
@@ -109,11 +107,6 @@ install -m 0644 %{SOURCE1008} %{buildroot}%{_unitdir_user}/pkgmgr-installer-sign
 install -m 0644 %{SOURCE1009} %{buildroot}%{_unitdir_user}/pkgmgr-installer-signal-agent.socket
 ln -sf ../pkgmgr-installer-signal-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/pkgmgr-installer-signal-agent.socket
 
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
-install -m 0644 %{SOURCE1010} %{buildroot}%{_unitdir}/pkgmgr-installer-signal-agent@.service
-install -m 0644 %{SOURCE1011} %{buildroot}%{_unitdir}/pkgmgr-installer-signal-agent@.socket
-ln -sf ../pkgmgr-installer-signal-agent@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/pkgmgr-installer-signal-agent@.socket
-
 mkdir -p %{buildroot}%{_sysconfdir}/package-manager/backend
 mkdir -p %{buildroot}%{_sysconfdir}/package-manager/backendlib
 mkdir -p %{buildroot}%{_sysconfdir}/opt/upgrade
@@ -196,9 +189,6 @@ rm -rf %{_sysconfdir}/package-manager/pkgmgr-label-initial-image.sh
 %{_unitdir_user}/pkgmgr-installer-signal-agent.service
 %{_unitdir_user}/pkgmgr-installer-signal-agent.socket
 %{_unitdir_user}/sockets.target.wants/pkgmgr-installer-signal-agent.socket
-%{_unitdir}/pkgmgr-installer-signal-agent@.service
-%{_unitdir}/pkgmgr-installer-signal-agent@.socket
-%{_unitdir}/user-sockets@.target.wants/pkgmgr-installer-signal-agent@.socket
 
 %files installer-devel
 %manifest %{name}-installer-devel.manifest