Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Dear Release Team,

Please unblock package drbd-utils.

The version currently in Stretch has a serious bug (#862248) that 
prevents the service from being disabled/enabled using update-rc.d.  
Furthermore, during the investigation of this issue, I realized that 
upgrades from previous versions might leave stale systemd links around.
The package in unstable fixes both issues.

Furthermore, in order to better align with upstream, the drbd service is 
disabled by default on new installations; upstream recommends using a 
cluster management software to control the DRBD service and has disabled 
the initscript in their own packages.

Full debdiff attached.

Regards,
Apollon

unblock drbd-utils/8.9.10-2
diff -Nru drbd-utils-8.9.10/debian/changelog drbd-utils-8.9.10/debian/changelog
--- drbd-utils-8.9.10/debian/changelog	2016-12-23 17:41:42.000000000 +0200
+++ drbd-utils-8.9.10/debian/changelog	2017-05-12 15:05:39.000000000 +0300
@@ -1,3 +1,22 @@
+drbd-utils (8.9.10-2) unstable; urgency=medium
+
+  * Fix the service enable/disable logic (broken since 8.9.8-1, closes:
+    #862248):
+    + Add Default-Start runlevels to the initscript so that it can be
+      enabled/disabled again (broken since 8.9.8-1, see #862248).
+    + Clean up stale systemd state on upgrade from versions that shipped a
+      native systemd unit.
+  * Disable the service by default on new installations, following upstream's
+    policy.
+    + Document disabling the service in debian/NEWS.
+    + Override lintian error about duplicate update-rc.d calls.
+  * Do not restart the drbd service on upgrade; kernel reconfiguration is not
+    needed when the tools change.
+  * d/NEWS: use the new source name and drop the epoch, to avoid displaying
+    existing notices on every upgrade.
+
+ -- Apollon Oikonomopoulos <apoi...@debian.org>  Fri, 12 May 2017 15:05:39 +0300
+
 drbd-utils (8.9.10-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru drbd-utils-8.9.10/debian/drbd-utils.lintian-overrides drbd-utils-8.9.10/debian/drbd-utils.lintian-overrides
--- drbd-utils-8.9.10/debian/drbd-utils.lintian-overrides	1970-01-01 02:00:00.000000000 +0200
+++ drbd-utils-8.9.10/debian/drbd-utils.lintian-overrides	2017-05-12 15:05:39.000000000 +0300
@@ -0,0 +1 @@
+drbd-utils: duplicate-updaterc.d-calls-in-postinst drbd
diff -Nru drbd-utils-8.9.10/debian/drbd-utils.postinst drbd-utils-8.9.10/debian/drbd-utils.postinst
--- drbd-utils-8.9.10/debian/drbd-utils.postinst	1970-01-01 02:00:00.000000000 +0200
+++ drbd-utils-8.9.10/debian/drbd-utils.postinst	2017-05-12 15:05:39.000000000 +0300
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+# Cleanup the old systemd unit state, if applicable
+if dpkg --compare-versions "$2" lt-nl "8.9.5-1~"; then
+	if deb-systemd-helper debian-installed drbd.service; then
+		deb-systemd-helper purge drbd.service >/dev/null
+		deb-systemd-helper unmask drbd.service >/dev/null
+	fi
+fi
+
+# Disable the DRBD service by default on new installations
+if [ -z "$2" ]; then
+	update-rc.d drbd defaults >/dev/null || true
+	update-rc.d drbd disable >/dev/null || true
+fi
+
+#DEBHELPER#
diff -Nru drbd-utils-8.9.10/debian/NEWS drbd-utils-8.9.10/debian/NEWS
--- drbd-utils-8.9.10/debian/NEWS	2015-04-30 15:53:09.000000000 +0300
+++ drbd-utils-8.9.10/debian/NEWS	2017-05-12 15:05:39.000000000 +0300
@@ -1,4 +1,22 @@
-drbd8 (2:8.4.4-1) unstable; urgency=low
+drbd-utils (8.9.10-2) unstable; urgency=medium
+
+  The drbd service is now disabled by default on new installations. Upstream
+  recommends that a cluster management software be used to control DRBD
+  instead. If your setup relies on the drbd service however, you can still
+  enable it using
+
+    systemctl enable drbd.service
+
+  or
+
+    update-rc.d drbd enable
+
+  Again, this applies only to new installations of the package, upgrades from
+  older versions will leave the service intact.
+
+ -- Apollon Oikonomopoulos <apoi...@debian.org>  Fri, 12 May 2017 20:15:24 +0300
+
+drbd-utils (8.4.4-1) unstable; urgency=low
 
   DRBD 8.4 includes a number of important changes from the 8.3 series, both
   in operation and in configuration files. An overview of these changes is
diff -Nru drbd-utils-8.9.10/debian/patches/initscript-add-start-runlevels.patch drbd-utils-8.9.10/debian/patches/initscript-add-start-runlevels.patch
--- drbd-utils-8.9.10/debian/patches/initscript-add-start-runlevels.patch	1970-01-01 02:00:00.000000000 +0200
+++ drbd-utils-8.9.10/debian/patches/initscript-add-start-runlevels.patch	2017-05-12 14:46:52.000000000 +0300
@@ -0,0 +1,18 @@
+Author: Apollon Oikonomopoulos <apoi...@debian.org>
+Description: Add Default-Start runlevels to the initscript
+ The initscripts lacks Default-Start runlevels, causing update-rc.d to
+ shortcircuit any attempt to enable/disable the service.
+Last-Update: 2017-05-12
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/862248
+--- a/scripts/drbd
++++ b/scripts/drbd
+@@ -13,7 +13,7 @@
+ # Required-Stop:  $local_fs $network $syslog
+ # Should-Start:   sshd multipathd
+ # Should-Stop:    sshd multipathd
+-# Default-Start:
++# Default-Start:  2 3 4 5
+ # Default-Stop:   0 1 6
+ # X-Start-Before: heartbeat corosync
+ # X-Stop-After:   heartbeat corosync
diff -Nru drbd-utils-8.9.10/debian/patches/series drbd-utils-8.9.10/debian/patches/series
--- drbd-utils-8.9.10/debian/patches/series	2016-07-18 22:47:46.000000000 +0300
+++ drbd-utils-8.9.10/debian/patches/series	2017-05-12 14:43:00.000000000 +0300
@@ -4,3 +4,4 @@
 disable-automatic-user-survey.patch
 initscript-remove-path.patch
 reproducible-build
+initscript-add-start-runlevels.patch
diff -Nru drbd-utils-8.9.10/debian/rules drbd-utils-8.9.10/debian/rules
--- drbd-utils-8.9.10/debian/rules	2016-12-23 17:41:42.000000000 +0200
+++ drbd-utils-8.9.10/debian/rules	2017-05-12 15:05:39.000000000 +0300
@@ -44,7 +44,7 @@
 
 
 override_dh_installinit:
-	dh_installinit --name=drbd --no-start
+	dh_installinit --name=drbd --no-start --no-restart-on-upgrade
 
 override_dh_gencontrol:
 	dh_gencontrol -Ndrbd8-utils

Reply via email to