The unified user session is about moving user session units, managed by
systemd --user, to main systemd, where it's managed as part of newly
created user@.target.
user@.target will contain same units as previously available in user/,
with same UID and environment setup. systemd instance is used for unit
to be able to specify UID (inherited from user@.target).
The rationale behind this work is following:
* VD requirement to remove user session support
* boot time optimization requirements, due to:
+ 'systemd --user' taking 1s its own startup that could be used for
unit startup
+ ability to better rearrange units if these managed by one systemd
instance
Unit installed by this commit will not be used till user login mechanism
will be changed in systemd package (via changing pam_systemd to start
user@.target, rather than user@.service).
Change-Id: I86da33a05560b73c44c39c073f4ac6ca11fd6e86
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/"