summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/disable-incremental-assembly.patch12
-rw-r--r--debian/patches/series1
-rw-r--r--udev-md-raid-assembly.rules3
4 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b7b3ec00..cd2f9c2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mdadm (3.3.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * disable-incremental-assembly.patch: incremental assembly prevents booting
+ in degraded mode (Closes: #784070)
+
+ -- Yann Soubeyrand <yann-externe.soubeyrand@edf.fr> Tue, 10 Nov 2015 11:18:39 +0100
+
mdadm (3.3.4-1) unstable; urgency=medium
[ Dimitri John Ledkov ]
diff --git a/debian/patches/disable-incremental-assembly.patch b/debian/patches/disable-incremental-assembly.patch
new file mode 100644
index 00000000..693a65dc
--- /dev/null
+++ b/debian/patches/disable-incremental-assembly.patch
@@ -0,0 +1,12 @@
+--- a/udev-md-raid-assembly.rules
++++ b/udev-md-raid-assembly.rules
+@@ -25,6 +25,9 @@ GOTO="md_inc_end"
+
+ LABEL="md_inc"
+
++# Disable incremental assembly to fix Debian bug #784070
++GOTO="md_inc_end"
++
+ # remember you can limit what gets auto/incrementally assembled by
+ # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
+ ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}"
diff --git a/debian/patches/series b/debian/patches/series
index 60a98a69..9aa3e3d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-external-blkid.diff
use-tempnode-not-devnode.patch
readlink-path.patch
mdmonitor-service-simplify.diff
+disable-incremental-assembly.patch
diff --git a/udev-md-raid-assembly.rules b/udev-md-raid-assembly.rules
index 4d27d630..5bde607f 100644
--- a/udev-md-raid-assembly.rules
+++ b/udev-md-raid-assembly.rules
@@ -25,6 +25,9 @@ GOTO="md_inc_end"
LABEL="md_inc"
+# Disable incremental assembly to fix Debian bug #784070
+GOTO="md_inc_end"
+
# remember you can limit what gets auto/incrementally assembled by
# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}"