From 39aa0ad696d5d6da75c2e16313fdc4ff68ea50e1 Mon Sep 17 00:00:00 2001
From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 20 Aug 2019 08:06:57 +0000
Subject: [PATCH] Revert "tizen: Add additional units for "unified" user
 session"

This reverts commit a2a4073acee7935040cc25380d4f51010903d9ca.

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

Change-Id: I11f6a43185aa3531c05787226a896d4a76cf2e11
---
 Makefile.am                | 13 +------------
 packaging/systemd.spec     |  9 ---------
 units/user-basic@.target   |  4 ----
 units/user-default@.target |  4 ----
 units/user-sockets@.target |  4 ----
 units/userlogin@.target    |  4 ----
 6 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 units/user-basic@.target
 delete mode 100644 units/user-default@.target
 delete mode 100644 units/user-sockets@.target
 delete mode 100644 units/userlogin@.target

diff --git a/Makefile.am b/Makefile.am
index 5b98582..a6e4c1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -275,7 +275,6 @@ SYSINIT_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
 BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
-USERLOGIN_TARGET_WANTS =
 USER_SOCKETS_TARGET_WANTS =
 USER_DEFAULT_TARGET_WANTS =
 USER_DELAYED_TARGET_WANTS =
@@ -296,7 +295,6 @@ install-target-wants-hook:
 	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(USERLOGIN_TARGET_WANTS)" && wants=userlogin@.target && dir=$(systemunitdir) && $(add-wants)
 	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
 	what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
 	what="$(USER_DELAYED_TARGET_WANTS)" && wants=delayed.target && dir=$(userunitdir) && $(add-wants)
@@ -529,16 +527,7 @@ dist_systemunit_DATA = \
 	units/systemd-udevd-kernel.socket \
 	units/system-update.target \
 	units/initrd-switch-root.target \
-	units/machines.target \
-	units/user-basic@.target \
-	units/user-default@.target \
-	units/user-sockets@.target \
-	units/userlogin@.target
-
-USERLOGIN_TARGET_WANTS += \
-	user-basic@.target \
-	user-default@.target \
-	user-sockets@.target
+	units/machines.target
 
 dist_systemunit_DATA += \
 	$(dist_systemunit_DATA_busnames)
diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 463a7b9..01946de 100644
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -229,11 +229,6 @@ EOF
 /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
 /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/syslog.target.wants
 
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/user-basic@.target.wants
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/user-default@.target.wants
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/user-sockets@.target.wants
-/usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/userlogin@.target.wants
-
 # Make sure the user generators dir exists too
 /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-generators
 /usr/bin/mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-generators
@@ -524,10 +519,6 @@ fi
 %exclude %{_prefix}/lib/systemd/resolv.conf
 
 %dir %{_prefix}/lib/systemd/system/basic.target.wants
-%dir %{_prefix}/lib/systemd/system/user-basic@.target.wants
-%dir %{_prefix}/lib/systemd/system/user-default@.target.wants
-%dir %{_prefix}/lib/systemd/system/user-sockets@.target.wants
-%dir %{_prefix}/lib/systemd/system/userlogin@.target.wants
 %dir %{_prefix}/lib/systemd/user
 %dir %{_prefix}/lib/systemd/network
 %dir %{_prefix}/lib/systemd/user/default.target.wants
diff --git a/units/user-basic@.target b/units/user-basic@.target
deleted file mode 100644
index f1a3888..0000000
--- a/units/user-basic@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Some target
-PartOf=user@%i.target
-After=user-sockets@%i.target
diff --git a/units/user-default@.target b/units/user-default@.target
deleted file mode 100644
index da3345c..0000000
--- a/units/user-default@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=Some target
-PartOf=user@%i.target
-After=user-basic@%i.target
diff --git a/units/user-sockets@.target b/units/user-sockets@.target
deleted file mode 100644
index a5b90ee..0000000
--- a/units/user-sockets@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-After=systemd-logind.service
-Description=Some target
-PartOf=user@%i.target
diff --git a/units/userlogin@.target b/units/userlogin@.target
deleted file mode 100644
index 28c4dc5..0000000
--- a/units/userlogin@.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=User %i login
-AllowIsolate=yes
-PartOf=user@%i.target
-- 
2.7.4