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

This reverts commit cc2ed40cbc75ac348b7145e93cdbee7d79663f50.

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

Change-Id: I57a556f59b197f91d5443247109ae2efd43e7c61

diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index 189412afb6581ed9fb5d239f5d44d5e761047d4a..fb696aa05457cc3978a29fc5a14901a4ca7ad839 100755 (executable)
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -10,8 +10,6 @@ Source2:    alarm-session-agent.service
 Source3:    alarm-session-agent.socket
 Source4:    alarm-manager.conf
 Source5:    99-rtc.rules
-Source6:    alarm-session-agent@.service
-Source7:    alarm-session-agent@.socket
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -127,15 +125,11 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/alarm-server.service
 install -m 0644 %SOURCE2 %{buildroot}%{_unitdir_user}/alarm-session-agent.service
 install -m 0644 %SOURCE3 %{buildroot}%{_unitdir_user}/alarm-session-agent.socket
-install -m 0644 %SOURCE6 %{buildroot}%{_unitdir}/alarm-session-agent@.service
-install -m 0644 %SOURCE7 %{buildroot}%{_unitdir}/alarm-session-agent@.socket
 ln -s ../alarm-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/alarm-server.service
 ln -sf ../alarm-session-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/alarm-session-agent.socket
-ln -sf ../alarm-session-agent@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/alarm-session-agent@.socket
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %SOURCE4 %{buildroot}%{_tmpfilesdir}/alarm-manager.conf
 mkdir -p %{buildroot}%{_libdir}/udev/rules.d
@@ -170,10 +164,7 @@ fi
 %{_unitdir}/multi-user.target.wants/alarm-server.service
 %{_unitdir_user}/alarm-session-agent.service
 %{_unitdir_user}/alarm-session-agent.socket
-%{_unitdir}/alarm-session-agent@.service
-%{_unitdir}/alarm-session-agent@.socket
 %{_unitdir_user}/sockets.target.wants/alarm-session-agent.socket
-%{_unitdir}/user-sockets@.target.wants/alarm-session-agent@.socket
 %attr(0644,root,root) %{_datadir}/dbus-1/system-services/org.tizen.alarm.manager.service
 %license LICENSE
 %config %{_sysconfdir}/dbus-1/system.d/alarm-service.conf

diff --git a/packaging/alarm-session-agent@.service b/packaging/alarm-session-agent@.service
deleted file mode 100644 (file)
index a4eb6ac..0000000
--- a/packaging/alarm-session-agent@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Start the alarm agent
-
-[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
-ExecStart=/usr/bin/alarm_session_agent
-
-[Install]
-WantedBy=user-default@.target

diff --git a/packaging/alarm-session-agent@.socket b/packaging/alarm-session-agent@.socket
deleted file mode 100644 (file)
index 34f2bea..0000000
--- a/packaging/alarm-session-agent@.socket
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/alarm_agent/%i
-DirectoryMode=0777
-ExecStartPost=/usr/bin/chmod 0777 /run/alarm_agent/%i
-
-[Install]
-WantedBy=user-sockets@.target