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

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

This reverts commit 371f1ade513b56bb89b8ecedbef16d6c3d7392c3.

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

Change-Id: I9102ccb19b82e3321c4e67d5f30c09643a85e585
---

diff --git a/packaging/launchpad-process-pool@.service b/packaging/launchpad-process-pool@.service
deleted file mode 100644
index 92b1b4b9..00000000
--- a/packaging/launchpad-process-pool@.service
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  Systemd script to Launch AMD Session agent
-#
-
-[Unit]
-PartOf=userlogin@%i.target
-Description=Start the USER Access Control Agent
-DefaultDependencies=no
-Requires=enlightenment-user@%i.service
-After=enlightenment-user@%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
-Capabilities=cap_sys_admin,cap_mac_admin,cap_setgid,cap_dac_override=i
-SecureBits=keep-caps
-ExecStartPre=-/usr/bin/mkdir -p /run/aul/daemons/%i
-ExecStartPre=-/usr/bin/chmod 0777 /run/aul/daemons/%i
-ExecStartPre=-/usr/bin/mkdir -p /run/aul/apps/%i
-ExecStartPre=-/usr/bin/chmod 0700 /run/aul/apps/%i
-ExecStartPre=-/usr/bin/mkdir -p /run/aul/dbspace/%i
-ExecStartPre=-/usr/bin/chmod 0701 /run/aul/dbspace/%i
-ExecStartPre=-/usr/bin/mkdir -p /run/aul/log/widget/%i
-ExecStartPre=-/usr/bin/chmod 0777 /run/aul/log/widget/%i
-ExecStart=/bin/sh -l -c "/usr/bin/launchpad-process-pool"
-Sockets=launchpad-process-pool@%i.socket
diff --git a/packaging/launchpad-process-pool@.socket b/packaging/launchpad-process-pool@.socket
deleted file mode 100644
index c408ac34..00000000
--- a/packaging/launchpad-process-pool@.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-[Socket]
-SocketUser=%i
-ListenStream=/run/aul/daemons/%i/.launchpad-process-pool-sock
-DirectoryMode=0777
-Service=launchpad-process-pool@%i.service
-
-[Install]
-WantedBy=user-sockets@.target
diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec
index 895e9ec5..e50fc06a 100644
--- a/packaging/launchpad.spec
+++ b/packaging/launchpad.spec
@@ -7,8 +7,6 @@ License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source101:  launchpad-process-pool.service
 Source102:  launchpad-process-pool.socket
-Source201:  launchpad-process-pool@.service
-Source202:  launchpad-process-pool@.socket
 
 
 BuildRequires:  cmake
@@ -118,13 +116,6 @@ install -m 0644 %SOURCE102 %{buildroot}%{_unitdir_user}/launchpad-process-pool.s
 ln -sf ../launchpad-process-pool.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket
 ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.target.wants/launchpad-process-pool.service
 
-mkdir -p %{buildroot}%{_unitdir}/user-basic@.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
-install -m 0644 %SOURCE201 %{buildroot}%{_unitdir}/launchpad-process-pool@.service
-install -m 0644 %SOURCE202 %{buildroot}%{_unitdir}/launchpad-process-pool@.socket
-ln -sf ../launchpad-process-pool@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/launchpad-process-pool@.socket
-ln -sf ../launchpad-process-pool@.service %{buildroot}%{_unitdir}/user-basic@.target.wants/launchpad-process-pool@.service
-
 %post
 
 %files
@@ -135,10 +126,6 @@ ln -sf ../launchpad-process-pool@.service %{buildroot}%{_unitdir}/user-basic@.ta
 %{_unitdir_user}/launchpad-process-pool.socket
 %{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket
 %{_unitdir_user}/basic.target.wants/launchpad-process-pool.service
-%{_unitdir}/launchpad-process-pool@.service
-%{_unitdir}/launchpad-process-pool@.socket
-%{_unitdir}/user-sockets@.target.wants/launchpad-process-pool@.socket
-%{_unitdir}/user-basic@.target.wants/launchpad-process-pool@.service
 %{_bindir}/launchpad-process-pool
 %{_prefix}/share/aul/launchpad.conf