[Piuparts-commits] [piuparts] 10/14: exception for faulty dhcp3-server config migration

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit 8f2f4ded1c48e6f7afae9fee97217336343e84ba
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Aug 14 07:30:52 2017 +0200

    exception for faulty dhcp3-server config migration
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/pre_distupgrade_exceptions | 6 ++++++
 debian/changelog                                  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/custom-scripts/scripts/pre_distupgrade_exceptions b/custom-scripts/scripts/pre_distupgrade_exceptions
index ee94945..c98e5d8 100755
--- a/custom-scripts/scripts/pre_distupgrade_exceptions
+++ b/custom-scripts/scripts/pre_distupgrade_exceptions
@@ -56,6 +56,12 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "squeeze" ]; then
 		touch /etc/udev/rules.d/.piuparts.dummy
 	fi
 
+	# isc-dhcp-server.postinst unconditionally overwrites conffile /etc/dhcp/dhcpd.conf
+	if is_installed dhcp3-server; then
+		log_debug
+		rm -fv /etc/dhcp3/dhcpd.conf
+	fi
+
 fi
 
 if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "wheezy" ]; then
diff --git a/debian/changelog b/debian/changelog
index bb288c7..e94e810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ piuparts (0.79) UNRELEASED; urgency=medium
   * scripts/pre_distupgrade_zz_database-server: Improve some upgrade paths.
   * scripts/post_purge_exceptions:
     - Restore /usr/lib/sasl2/ disappearing on some jessie->stretch upgrades.
+  * Add/update exceptions for some ancient packages.
   * master-bin/reschedule_oldest_logs: Expiration age values starting with "+"
     are relative to the rescheduling age.
   * master-bin/detect_network_issues: Detect appstream metadata errors.

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