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

This reverts commit 8b0d0dc69e9974b40c493eb0b71b837f7084917e.

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

Change-Id: I7d6bb4f2d042053dd424657d268ea383fad0ca56

diff --git a/packaging/swap-manager.spec b/packaging/swap-manager.spec
index 335ed4a3daf077008b4e31ff539aad701d5ba573..00e98cf9cde5778a447ac228c4196fcadee29aa6 100644 (file)
--- a/packaging/swap-manager.spec
+++ b/packaging/swap-manager.spec
@@ -147,7 +147,6 @@ export LIBDIR=%{_libdir}
 #   system
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
 #   user
 mkdir -p %{buildroot}%{_unitdir_user}
 mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
@@ -167,19 +166,11 @@ install -m 0644 systemd/swap_auxd.service %{buildroot}%{_unitdir_user}/
 install -m 0644 systemd/swap_auxd.socket %{buildroot}%{_unitdir_user}/
 ln -s ../swap_auxd.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/
 
-install -m 0644 systemd/swap_auxd@.service %{buildroot}%{_unitdir}/
-install -m 0644 systemd/swap_auxd@.socket %{buildroot}%{_unitdir}/
-ln -s ../swap_auxd@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/
-
 #   swap_memd
 install -m 0644 systemd/swap_memd.service %{buildroot}%{_unitdir_user}/
 install -m 0644 systemd/swap_memd.socket %{buildroot}%{_unitdir_user}/
 ln -s ../swap_memd.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/
 
-install -m 0644 systemd/swap_memd@.service %{buildroot}%{_unitdir}/
-install -m 0644 systemd/swap_memd@.socket %{buildroot}%{_unitdir}/
-ln -s ../swap_memd@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/
-
 # tmpfiles.d
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0666 systemd/swap.conf %{buildroot}%{_tmpfilesdir}/swap.conf
@@ -240,19 +231,11 @@ fi
 %{_unitdir_user}/swap_auxd.service
 %{_unitdir_user}/sockets.target.wants/swap_auxd.socket
 
-%{_unitdir}/swap_auxd@.socket
-%{_unitdir}/swap_auxd@.service
-%{_unitdir}/user-sockets@.target.wants/swap_auxd@.socket
-
 # swap_memd
 %{_unitdir_user}/swap_memd.socket
 %{_unitdir_user}/swap_memd.service
 %{_unitdir_user}/sockets.target.wants/swap_memd.socket
 
-%{_unitdir}/swap_memd@.socket
-%{_unitdir}/swap_memd@.service
-%{_unitdir}/user-sockets@.target.wants/swap_memd@.socket
-
 %{_tmpfilesdir}/swap.conf
 %{_udevrulesdir}/99-swap_dev.rules
 

diff --git a/systemd/swap_auxd@.service b/systemd/swap_auxd@.service
deleted file mode 100644 (file)
index e2ede44..0000000
--- a/systemd/swap_auxd@.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=swap_auxd 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
-Type=notify
-NotifyAccess=main
-
-Sockets=swap_auxd@%i.socket
-
-ExecStart=/usr/bin/swap_auxd
-
-StandardOutput=journal+console
-StandardError=journal+console

diff --git a/systemd/swap_auxd@.socket b/systemd/swap_auxd@.socket
deleted file mode 100644 (file)
index 6b83b86..0000000
--- a/systemd/swap_auxd@.socket
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=swap_auxd socket
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/user/%i/system_share/swap/auxd.socket
-ExecStartPost=/usr/bin/chmod 0666 /run/user/%i/system_share/swap/auxd.socket
-
-Service=swap_auxd@%i.service
-
-[Install]
-WantedBy=user-sockets@.target

diff --git a/systemd/swap_memd@.service b/systemd/swap_memd@.service
deleted file mode 100644 (file)
index 1440eb5..0000000
--- a/systemd/swap_memd@.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=swap_memd 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
-Type=notify
-NotifyAccess=main
-
-Sockets=swap_memd@%i.socket
-
-ExecStart=/usr/bin/swap_memd
-
-StandardOutput=journal+console
-StandardError=journal+console

diff --git a/systemd/swap_memd@.socket b/systemd/swap_memd@.socket
deleted file mode 100644 (file)
index e9400c3..0000000
--- a/systemd/swap_memd@.socket
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=swap_memd socket
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/user/%i/system_share/swap/memd.socket
-ExecStartPost=/usr/bin/chmod 0666 /run/user/%i/system_share/swap/memd.socket
-
-Service=swap_memd@%i.service
-
-[Install]
-WantedBy=user-sockets@.target