[Pkg-samba-maint] [samba] 02/05: nmbd requires a working network (Closes: #698056, #842056, #840608, LP: #1635491)

[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 96e5d3b49bf4331e95ec857289a46ff909477372
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Oct 31 20:45:27 2016 +0100

    nmbd requires a working network (Closes: #698056, #842056, #840608, LP: #1635491)
    
    (cherry picked from commit 8f80d6f76c80018d72061233bca6192da9682696)
---
 .../patches/nmbd-requires-a-working-network.patch  | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 packaging/systemd/nmb.service                      |  3 ++-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/patches/nmbd-requires-a-working-network.patch b/debian/patches/nmbd-requires-a-working-network.patch
new file mode 100644
index 0000000..dd20864
--- /dev/null
+++ b/debian/patches/nmbd-requires-a-working-network.patch
@@ -0,0 +1,30 @@
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Mon, 31 Oct 2016 20:45:27 +0100
+Subject: nmbd requires a working network
+
+Bug-Debian: https://bugs.debian.org/698056
+Bug-Debian: https://bugs.debian.org/842056
+Bug-Debian: https://bugs.debian.org/840608
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1635491
+
+---
+ packaging/systemd/nmb.service | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
+index c02e65d..71cf1c2 100644
+--- a/packaging/systemd/nmb.service
++++ b/packaging/systemd/nmb.service
+@@ -1,7 +1,8 @@
+ [Unit]
+ Description=Samba NMB Daemon
+ Documentation=man:nmbd(8) man:samba(7) man:smb.conf(5)
+-After=network.target
++After=network-online.target
++Wants=network-online.target
+ 
+ [Service]
+ Type=notify
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 9814941..d84f487 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,5 @@ systemd-syslog.target-is-obsolete.patch
 Add-documentation-to-systemd-Unit-files.patch
 fix_kill_path_in_units.patch
 CTDB-Fix-samba-eventscript.patch
+nmbd-requires-a-working-network.patch
 Fix_parallel_build.patch
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
index c02e65d..71cf1c2 100644
--- a/packaging/systemd/nmb.service
+++ b/packaging/systemd/nmb.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Samba NMB Daemon
 Documentation=man:nmbd(8) man:samba(7) man:smb.conf(5)
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=notify

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