systemd: Fix dependencies.

Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Fri Nov  4 12:36:04 CET 2011 on sn-devel-104
(cherry picked from commit 4f3e86f62398218c454b979aaad75c7d7d3d8546)

The last 3 patches address bug #8575 (Add systemd files to 3.6).

diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
index 7d765db83ce14c5e03cbcefc0e1b51449f65aa6d..70d98420db67335d5b6495c7a73b6a3f8b822457 100644 (file)
--- a/packaging/systemd/smb.service
+++ b/packaging/systemd/smb.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Samba SMB Daemon
-After=syslog.target network.target
+After=syslog.target network.target nmb.service winbind.service
 
 [Service]
 Type=forking

diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
index 91f9112a35315fb89f8e61b56726114ac9127e88..9ce1b520419a7df37eea6156443578cb046c87a3 100644 (file)
--- a/packaging/systemd/winbind.service
+++ b/packaging/systemd/winbind.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Samba Winbind Daemon
-Requires=smb.service nmb.service
-After=syslog.target network.target smb.service nmb.service
+After=syslog.target network.target nmb.service
 
 [Service]
 Type=forking