Fix: launch security-manager-cleanup after /opt/usr is mounted.

Change-Id: I1f6f4b2a9b9712ee5ed1a1a539a3059249a90b04

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index 0485a52..473098d 100644 (file)
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -122,12 +122,12 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}/%{_unitdir}/sockets.target.wants
-mkdir -p %{buildroot}/%{_unitdir}/sysinit.target.wants
+mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants
 mkdir -p %{buildroot}/%{_unitdir}/basic.target.wants
 mkdir -p %{buildroot}/%{_unitdir}/dbus.service.wants
 mkdir -p %{buildroot}/%{_unitdir}/cynara.service.wants
 ln -s ../security-manager.socket %{buildroot}/%{_unitdir}/sockets.target.wants/security-manager.socket
-ln -s ../security-manager-cleanup.service %{buildroot}/%{_unitdir}/sysinit.target.wants/security-manager-cleanup.service
+ln -s ../security-manager-cleanup.service %{buildroot}/%{_unitdir}/multi-user.target.wants/security-manager-cleanup.service
 ln -s ../security-manager-rules-loader.service %{buildroot}/%{_unitdir}/basic.target.wants/security-manager-rules-loader.service
 ln -s ../security-manager.service %{buildroot}/%{_unitdir}/dbus.service.wants/security-manager.service
 ln -s ../license-manager-agent.service %{buildroot}/%{_unitdir}/cynara.service.wants/license-manager-agent.service
@@ -267,7 +267,7 @@ chsmack -a System %{db_test_dir}/.security-manager-test-empty.db-journal
 %attr(-,root,root) %{_unitdir}/security-manager-rules-loader.service
 %attr(-,root,root) %{_unitdir}/basic.target.wants/security-manager-rules-loader.service
 %attr(-,root,root) %{_unitdir}/sockets.target.wants/security-manager.*
-%attr(-,root,root) %{_unitdir}/sysinit.target.wants/security-manager-cleanup.*
+%attr(-,root,root) %{_unitdir}/multi-user.target.wants/security-manager-cleanup.*
 %config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db
 %config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db-journal
 

diff --git a/systemd/security-manager-cleanup.service.in b/systemd/security-manager-cleanup.service.in
index 59d27a4..a82263d 100644 (file)
--- a/systemd/security-manager-cleanup.service.in
+++ b/systemd/security-manager-cleanup.service.in
@@ -1,8 +1,8 @@
 [Unit]
 Description=Cleanup private sharing
-DefaultDependencies=no
-After=sysinit.target
-Requires=sysinit.target
+RequiresMountsFor=/tmp
+Wants=wait-mount@opt-usr.service
+After=wait-mount@opt-usr.service
 
 [Service]
 Type=oneshot