[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: dhclient3 was renamed to dhclient long time ago...

[Mathieu Parent]

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


Commits:
04bfc021 by Mathieu Parent at 2018-04-17T22:19:39+02:00
dhclient3 was renamed to dhclient long time ago...

- - - - -
a306f250 by Mathieu Parent at 2018-04-17T22:22:17+02:00
Remove /etc/samba/dhcp.conf on purge (Closes: #784713)

- - - - -


2 changed files:

- debian/samba-common.config
- debian/samba-common.postrm


Changes:

=====================================
debian/samba-common.config
=====================================
--- a/debian/samba-common.config
+++ b/debian/samba-common.config
@@ -63,8 +63,8 @@ db_input medium samba-common/workgroup || true
 db_go
 
 DHCPPRIORITY=medium
-#if [ "$DEBCONF_RECONFIGURE" = 1 ] && [ -f /sbin/dhclient3 ]
-if [ -f /sbin/dhclient3 ]
+#if [ "$DEBCONF_RECONFIGURE" = 1 ] && [ -f /sbin/dhclient ]
+if [ -f /sbin/dhclient ]
 then
 	DHCPPRIORITY=high
 # TODO: see if we can detect that dhcp-client is *going* to be installed,


=====================================
debian/samba-common.postrm
=====================================
--- a/debian/samba-common.postrm
+++ b/debian/samba-common.postrm
@@ -16,6 +16,9 @@ if [ "$1" = purge ]; then
 	if [ -x "`which ucfr 2>/dev/null`" ]; then
 		ucfr --purge samba-common /etc/samba/smb.conf
 	fi
+	if [ -f /etc/samba/dhcp.conf ]; then
+		rm /etc/samba/dhcp.conf
+	fi
 fi
 
 #DEBHELPER#



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/3ce079982b09ad189ffcc22ec27e0964bc7f467a...a306f25021195221a28da13231e998ed3861d1f0

---
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/3ce079982b09ad189ffcc22ec27e0964bc7f467a...a306f25021195221a28da13231e998ed3861d1f0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20180417/963da5a0/attachment-0001.html>