This reverts commit
c912cbe6b33ba30309388719316775e5fc44555a.
We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.
Change-Id: I75ea2b0f4e6762d23cc31c0814953ccb69866e69
install -m 644 service/tdm-socket-user.service %{buildroot}%{_unitdir_user}
install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
install -m 644 service/tdm-socket-user.service %{buildroot}%{_unitdir_user}
install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
-%__mkdir_p %{buildroot}%{_unitdir}
-install -m 644 service/tdm-socket-user@.service %{buildroot}%{_unitdir}
-install -m 644 service/tdm-socket-user@.path %{buildroot}%{_unitdir}
-
%__mkdir_p %{_unitdir_user}/basic.target.wants
ln -sf ../tdm-socket-user.path %{_unitdir_user}/basic.target.wants/
%__mkdir_p %{_unitdir_user}/basic.target.wants
ln -sf ../tdm-socket-user.path %{_unitdir_user}/basic.target.wants/
-%__mkdir_p %{_unitdir}/user-basic@.target.wants
-ln -sf ../tdm-socket-user@.path %{_unitdir}/user-basic@.target.wants/
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
-rm -f %{_unitdir}/user-basic@.target.wants/tdm-socket-user@.path
%files
%manifest %{name}.manifest
%files
%manifest %{name}.manifest
%attr(750,root,root) %{_bindir}/tdm-monitor
%{_unitdir_user}/tdm-socket-user.path
%{_unitdir_user}/tdm-socket-user.service
%attr(750,root,root) %{_bindir}/tdm-monitor
%{_unitdir_user}/tdm-socket-user.path
%{_unitdir_user}/tdm-socket-user.service
-%{_unitdir}/tdm-socket-user@.path
-%{_unitdir}/tdm-socket-user@.service
%files devel
%manifest %{name}.manifest
%files devel
%manifest %{name}.manifest
+++ /dev/null
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-After=systemd-logind.service systemd-logind.service
-Description=Wait for tdm-socket
-
-[Path]
-PathExists=/run/tdm-socket
+++ /dev/null
-[Unit]
-PartOf=userlogin@%i.target
-After=systemd-logind.service
-After=display-manager.service systemd-logind.service
-Description=Creating a link file for user to access tdm-socket
-DefaultDependencies=no
-Before=starter@%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
-Type=oneshot
-ExecStart=/usr/bin/sh -c "while [ ! -e /run/tdm-socket ] ; do /usr/bin/sleep .1 ; done ;/usr/bin/ln -s /run/tdm-socket /run/user/%i/"