[samba/f16] Fix systemd dependencies.
asn
asn at fedoraproject.org
Mon Nov 7 12:33:37 UTC 2011
commit 43d0afca8671cce4e8b9536a6b146b92a620386d
Author: Andreas Schneider <asn at redhat.com>
Date: Mon Nov 7 13:23:46 2011 +0100
Fix systemd dependencies.
samba.spec | 6 +++++-
samba.sysconfig | 18 +++++++++++++-----
smb.service | 2 +-
winbind.service | 3 +--
4 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index b8b67d9..a31242d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,4 +1,4 @@
-%define main_release 74
+%define main_release 75
%define samba_version 3.6.1
%define tdb_version 1.2.9
%define talloc_version 2.0.5
@@ -667,6 +667,10 @@ fi
%{_datadir}/pixmaps/samba/logo-small.png
%changelog
+* Fri Nov 04 2011 Andreas Schneider <asn at redhat.com> - 1:3.6.1-75
+- Fix systemd dependencies
+- resolves: #751397
+
* Wed Oct 26 2011 Andreas Schneider <asn at redhat.com> - 1:3.6.1-74
- Update to 3.6.1
diff --git a/samba.sysconfig b/samba.sysconfig
index 944b72f..5950b13 100644
--- a/samba.sysconfig
+++ b/samba.sysconfig
@@ -1,6 +1,14 @@
-# Options to smbd
-SMBDOPTIONS="-D"
-# Options to nmbd
-NMBDOPTIONS="-D"
-# Options for winbindd
+## Path: Network/Samba
+## Description: Samba process options
+## Type: string
+## Default: ""
+## ServiceRestart: smb
+SMBDOPTIONS=""
+## Type: string
+## Default: ""
+## ServiceRestart: nmb
+NMBDOPTIONS=""
+## Type: string
+## Default: ""
+## ServiceRestart: winbind
WINBINDOPTIONS=""
diff --git a/smb.service b/smb.service
index 7d765db..70d9842 100644
--- a/smb.service
+++ b/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/winbind.service b/winbind.service
index 91f9112..9ce1b52 100644
--- a/winbind.service
+++ b/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
More information about the scm-commits
mailing list