[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: Fix "/etc/dhcp/dhclient-enter-hooks.d/samba returned non-zero exit status 1"…

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
07ebc683 by Mathieu Parent at 2018-03-01T21:51:08+01:00
Fix "/etc/dhcp/dhclient-enter-hooks.d/samba returned non-zero exit status 1" when samba.service is disabled

Pick patch from Ubuntu for Launchpad #1579597

- - - - -
33312704 by Mathieu Parent at 2018-03-01T21:51:32+01:00
Fix systemd check

- - - - -
91828977 by Mathieu Parent at 2018-03-01T21:53:49+01:00
Changelog for previous commits

- - - - -


2 changed files:

- debian/changelog
- debian/samba-common.dhcp


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-samba (2:4.7.4+dfsg-1.1) unstable; urgency=medium
+samba (2:4.7.4+dfsg-2) UNRELEASED; urgency=medium
 
-  * Non-maintainer upload.
+  [ Andreas Hasenack ]
   * Add extra DEP8 tests to samba (Closes: #890439):
     - d/t/control, d/t/cifs-share-access: access a file in a share using cifs
     - d/t/control, d/t/smbclient-anonymous-share-list: list available shares
@@ -10,7 +10,13 @@ samba (2:4.7.4+dfsg-1.1) unstable; urgency=medium
     - d/t/control, d/t/smbclient-share-access: create a share and download a
       file from it
 
- -- Andreas Hasenack <andreas at canonical.com>  Wed, 14 Feb 2018 17:46:13 -0200
+  [ Mathieu Parent ]
+  * Fix "/etc/dhcp/dhclient-enter-hooks.d/samba returned non-zero exit status 1"
+    when samba.service is disabled
+    - Pick patch from Ubuntu for Launchpad #1579597
+    - Fix systemd check
+
+ -- Mathieu Parent <sathieu at debian.org>  Thu, 01 Mar 2018 21:51:45 +0100
 
 samba (2:4.7.4+dfsg-1) unstable; urgency=medium
 


=====================================
debian/samba-common.dhcp
=====================================
--- a/debian/samba-common.dhcp
+++ b/debian/samba-common.dhcp
@@ -68,8 +68,18 @@ netbios_setup() {
 
 	# reload the samba server
 	# We don't necessarily have the samba package installed. #414841
-	[ ! -x /etc/init.d/smbd ] || /usr/sbin/invoke-rc.d smbd reload
-
+	if [ -x /etc/init.d/smbd ]
+	then
+		if [ -d /run/systemd/system ]
+		then
+			if systemctl is-enabled smbd.service --quiet
+			then
+				systemctl try-reload-or-restart smbd.service
+			fi
+		else
+			/usr/sbin/invoke-rc.d smbd reload
+		fi
+	fi
 }
 
 netbios_setup



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/999bece68923e5c50670f2386c6539cd2e053442...918289775cc4d7d91db3b484240ccd8d892fb93f

---
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/999bece68923e5c50670f2386c6539cd2e053442...918289775cc4d7d91db3b484240ccd8d892fb93f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20180301/a501e350/attachment-0001.html>