# HG changeset patch
# User Matthias Förste <foerste@schlittermann.de>
# Date 1416493483 -3600
# Node ID 174708b8aacab8687b00be4c439f7641a1720e89
# Parent  31050debf00325efaf4fe686c06757306f730571# Parent  1b798e131cd9ecfa29e630557a94d5ab5e0595c6
merged branch "x"

diff -r 31050debf003 -r 174708b8aaca debian/changelog
--- a/debian/changelog	Fri Nov 14 16:35:50 2014 +0100
+++ b/debian/changelog	Thu Nov 20 15:24:43 2014 +0100
@@ -1,3 +1,15 @@
+verify-drbd (0.4) wheezy-backports; urgency=low
+
+  * adapt to syntax changes in drbd-utils > 8.4
+
+ -- Matthias Förste <foerste@schlittermann.de>  Thu, 20 Nov 2014 14:45:08 +0100
+
+verify-drbd (0.3.1) oldstable stable; urgency=low
+
+  * syntax changes in drbd-utils > 8.4 break current releases
+
+ -- Matthias Förste <foerste@schlittermann.de>  Thu, 20 Nov 2014 14:32:13 +0100
+
 verify-drbd (0.3) oldstable stable; urgency=low
 
   * depends: the dynamic speed controller used is not available in drbd-utils
diff -r 31050debf003 -r 174708b8aaca debian/control
--- a/debian/control	Fri Nov 14 16:35:50 2014 +0100
+++ b/debian/control	Thu Nov 20 15:24:43 2014 +0100
@@ -9,7 +9,8 @@
 
 Package: verify-drbd
 Architecture: all
-Depends: drbd-utils (>= 8.3.8) | drbd8-utils (>= 8.3.8),  ${misc:Depends}
+Depends: drbd-utils (>= 8.4) | drbd8-utils (>= 8.4),  ${misc:Depends}
+Conflicts: drbd-utils (<< 8.4), drbd8-utils (<< 8.4)
 Description: run drbd verification periodically
  This package provides a script which runs a verification on all drbd devices
  of a system using the dynamic resync speed controller and a cron job which
diff -r 31050debf003 -r 174708b8aaca verify-drbd.sh
--- a/verify-drbd.sh	Fri Nov 14 16:35:50 2014 +0100
+++ b/verify-drbd.sh	Thu Nov 20 15:24:43 2014 +0100
@@ -29,7 +29,8 @@
 fi
 
 for r in $RESOURCES; do
-    drbdadm -- -p 1 -s 64k -v $VERIFY_ALG syncer $r
+    drbdadm -- --c-plan-ahead 1 --c-fill-target 64k disk-options $r
+    drbdadm -- --verify-alg $VERIFY_ALG net-options $r
     drbdadm verify $r
 done