Remove dbus.service.wants dependency

Change-Id: I54c7abd0158ddd993ab09982171c6994d41bc08b

diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec
index c5935f2..f3e9fae 100644 (file)
--- a/packaging/security-manager.spec
+++ b/packaging/security-manager.spec
@@ -124,12 +124,10 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_unitdir}/sockets.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}/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
 
 mkdir -p %{buildroot}/%{TZ_SYS_DB}
@@ -293,7 +291,6 @@ chsmack -a System %{db_test_dir}/.security-manager-test-rules*.txt
 %manifest %{_datadir}/libnss-security-manager.manifest
 %license LICENSE
 %defattr(-,root,root,-)
-%%attr(-,root,root) %{_unitdir}/dbus.service.wants/security-manager.service
 %{_libdir}/libnss_securitymanager.so.*
 
 %files -n security-manager-policy

diff --git a/systemd/security-manager-valgrind.service.in b/systemd/security-manager-valgrind.service.in
index ad02fcf..2338545 100644 (file)
--- a/systemd/security-manager-valgrind.service.in
+++ b/systemd/security-manager-valgrind.service.in
@@ -1,6 +1,5 @@
 [Unit]
 Description=Start the security manager
-Before=dbus.service
 
 [Service]
 Type=notify
@@ -10,6 +9,3 @@ ExecStart=@BIN_INSTALL_DIR@/valgrind -v --tool=memcheck --log-file=/tmp/security
 Sockets=security-manager.socket
 Restart=always
 SmackProcessLabel=System::Privileged
-
-[Install]
-WantedBy=dbus.service