[Pkg-samba-maint] [samba] 01/05: CTDB: Fix samba eventscript

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch experimental
in repository samba.

commit e8c2e95715f9e9f00bb03fa5749a3f2dd2746d3e
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Oct 31 15:17:34 2016 +0100

    CTDB: Fix samba eventscript
    
    See https://bugzilla.samba.org/show_bug.cgi?id=12371
    
    (cherry picked from commit fa4873a2c30cdfdd90fdb76f91a2462b58c807ed)
---
 ctdb/config/events.d/50.samba                   |  4 ++--
 debian/patches/CTDB-Fix-samba-eventscript.patch | 28 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
index b521d00..4a532a4 100755
--- a/ctdb/config/events.d/50.samba
+++ b/ctdb/config/events.d/50.samba
@@ -14,8 +14,8 @@ case $CTDB_INIT_STYLE in
 		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb}
 		;;
 	debian)
-		CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
-		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
+		CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smbd}
+		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmbd}
 		;;
 	*)
 		# Use redhat style as default:
diff --git a/debian/patches/CTDB-Fix-samba-eventscript.patch b/debian/patches/CTDB-Fix-samba-eventscript.patch
new file mode 100644
index 0000000..96df814
--- /dev/null
+++ b/debian/patches/CTDB-Fix-samba-eventscript.patch
@@ -0,0 +1,28 @@
+From b76ddaf79904e4cd75f61e0402d62191d314c6bf Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Mon, 31 Oct 2016 15:17:34 +0100
+Subject: [PATCH] CTDB: Fix samba eventscript
+
+See https://bugzilla.samba.org/show_bug.cgi?id=12371
+---
+ ctdb/config/events.d/50.samba | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ctdb/config/events.d/50.samba b/ctdb/config/events.d/50.samba
+index 1742ff1..893b9c0 100755
+--- a/ctdb/config/events.d/50.samba
++++ b/ctdb/config/events.d/50.samba
+@@ -14,8 +14,8 @@ case $CTDB_INIT_STYLE in
+ 		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb}
+ 		;;
+ 	debian)
+-		CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
+-		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
++		CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-smbd}
++		CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmbd}
+ 		;;
+ 	*)
+ 		# Use redhat style as default:
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index ca14c11..9814941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,5 @@ Skip-raw.write-tests.patch
 systemd-syslog.target-is-obsolete.patch
 Add-documentation-to-systemd-Unit-files.patch
 fix_kill_path_in_units.patch
+CTDB-Fix-samba-eventscript.patch
 Fix_parallel_build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git