Merge ~rafaeldtinoco/ubuntu/+source/samba:lp1831381-eoan-devel-ctdb into ubuntu/+source/samba:ubuntu/eoan-devel

[Rafael David Tinoco]

This is a minor fix for the last merge. Please consider it so I can SRU both together into other versions.

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Sponsoring cbd9bfb3d238d356564413b1767c6c4cfea621df

Tagged and uploaded:

$ git push pkg upload/2%4.10.0+dfsg-0ubuntu6
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 2 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.34 KiB | 28.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/samba
 * [new tag] upload/2%4.10.0+dfsg-0ubuntu6 -> upload/2%4.10.0+dfsg-0ubuntu6

$ dput ubuntu ../samba_4.10.0+dfsg-0ubuntu6_source.changes
Checking signature on .changes
gpg: ../samba_4.10.0+dfsg-0ubuntu6_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../samba_4.10.0+dfsg-0ubuntu6.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.10.0+dfsg-0ubuntu6.dsc: done.
  Uploading samba_4.10.0+dfsg-0ubuntu6.debian.tar.xz: done.
  Uploading samba_4.10.0+dfsg-0ubuntu6_source.buildinfo: done.
  Uploading samba_4.10.0+dfsg-0ubuntu6_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 0e180bf..160e7a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+samba (2:4.10.0+dfsg-0ubuntu6) eoan; urgency=medium
+
+  * d/p/fix-nfs-service-name-to-nfs-kernel-server.patch:
+    change service name from nfs to nfs-kernel-server in
+    legacy script 06.nfs.script also (LP: #722201)
+
+ -- Rafael David Tinoco <[e-mail]>  Thu, 11 Jul 2019 21:44:49 +0000
+
 samba (2:4.10.0+dfsg-0ubuntu5) eoan; urgency=medium
 
   * debian/rules: Make DEB_HOST_ARCH_CPU initialized through
diff --git a/debian/patches/fix-nfs-service-name-to-nfs-kernel-server.patch b/debian/patches/fix-nfs-service-name-to-nfs-kernel-server.patch
index c0d8843..eab4d6f 100644
--- a/debian/patches/fix-nfs-service-name-to-nfs-kernel-server.patch
+++ b/debian/patches/fix-nfs-service-name-to-nfs-kernel-server.patch
@@ -17,14 +17,27 @@ Signed-off-by: Rafael David Tinoco <[e-mail]>
 Author: Rafael David Tinoco <[e-mail]>
 Bug-Debian: https://bugs.debian.org/929931
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/722201
-Last-Update: 2018-06-26
-
+Last-Update: 2018-07-11
 ---
+ ctdb/config/events/legacy/06.nfs.script |  2 +-
  ctdb/config/events/legacy/60.nfs.script |  4 ++--
  ctdb/config/nfs-linux-kernel-callout    | 12 ++++++------
  ctdb/config/statd-callout               |  4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
+ 4 files changed, 11 insertions(+), 11 deletions(-)
 
+diff --git a/ctdb/config/events/legacy/06.nfs.script b/ctdb/config/events/legacy/06.nfs.script
+index 97086f78e..7b7614228 100755
+--- a/ctdb/config/events/legacy/06.nfs.script
++++ b/ctdb/config/events/legacy/06.nfs.script
+@@ -6,7 +6,7 @@
+ 
+ . "${CTDB_BASE}/functions"
+ 
+-service_name="nfs"
++service_name="nfs-kernel-server"
+ 
+ load_script_options "service" "60.nfs"
+ 
 diff --git a/ctdb/config/events/legacy/60.nfs.script b/ctdb/config/events/legacy/60.nfs.script
 index 2eb90b421..5c6a09033 100755
 --- a/ctdb/config/events/legacy/60.nfs.script
@@ -42,7 +55,7 @@ index 2eb90b421..5c6a09033 100755
  load_script_options
  
 diff --git a/ctdb/config/nfs-linux-kernel-callout b/ctdb/config/nfs-linux-kernel-callout
-index 9b72446b4..3acd43fee 100755
+index 46950565d..f691607b0 100755
 --- a/ctdb/config/nfs-linux-kernel-callout
 +++ b/ctdb/config/nfs-linux-kernel-callout
 @@ -13,9 +13,9 @@ set -e