summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-12-05 19:13:56 +0300
committerMichael Tokarev <mjt@tls.msk.ru>2014-12-05 19:13:56 +0300
commit8b3fbb843db532354855d846dbd9b8a31e780e65 (patch)
treecdb871539d0e581ca04c16bc694c9a4d38b65932 /debian
parentd9b45eecf433b0f5e239ec08f3a6bf77a7f8b4e9 (diff)
use-tempnode-not-devnode.patch: use $tempnode instead of $devnode in udev rules file (#770883)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/use-tempnode-not-devnode.patch31
3 files changed, 43 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a1a51876..5bf02aee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mdadm (3.3.2-5) UNRELEASED; urgency=low
+
+ * use-tempnode-not-devnode.patch: change udev rules file to use
+ $tempnode which works both on wheezy and jessie udev, instead
+ of $devnode which only works in jessie. At this stage it is
+ better to make rules file compatible with old version instead
+ of adding versioned dependency. Should be removed for jessie+1.
+ (Closes: #770883)
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Fri, 05 Dec 2014 19:10:57 +0300
+
mdadm (3.3.2-4) unstable; urgency=medium
* really remove /var/lib/mdadm in postinst, fixing a brown-paper bag
diff --git a/debian/patches/series b/debian/patches/series
index 1bd27f93..c13a5c88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ debian-conffile-location.diff
debian-no-Werror.diff
sha1-includes.diff
use-external-blkid.diff
+use-tempnode-not-devnode.patch
build-sys-no-check_rundir.patch
rebuildmap-strip-local-host-name-from-device-name.patch
readlink-path.patch
diff --git a/debian/patches/use-tempnode-not-devnode.patch b/debian/patches/use-tempnode-not-devnode.patch
new file mode 100644
index 00000000..38a55044
--- /dev/null
+++ b/debian/patches/use-tempnode-not-devnode.patch
@@ -0,0 +1,31 @@
+From: Michael Tokarev <mjt@tls.msk.ru>
+Subject: use tempnode not devnode in udev rules
+Bug-Debian: http://bugs.debian.org/770883
+Forwarded: no
+
+udev in wheezy does not understand $devnode construct
+in rules file, while upstream uses it in mdadm rules
+files. udev in jessie has $devnode and it also supports
+old $tempnode which is the way it worked in wheezy and
+before, even if $tempnode in jessie's udev is not documented.
+So on jessie, both $tempnode and $devnode works fine, while
+in wheezy, only $tempnode works.
+
+Use $tempnode instead of $devnode. Since mdadm is important
+enough for system functionality and easily can break system
+by making it unbootable, and this is the only incompatibility
+between wheezy's and jessie's udev wrt mdadm, it is better than
+having a versioned dependency on udev.
+
+This patch is debian-specific and should be dropped for jessie+1.
+
+--- a/udev-md-raid-arrays.rules
++++ b/udev-md-raid-arrays.rules
+@@ -20 +20 @@
+-IMPORT{program}="BINDIR/mdadm --detail --export $devnode"
++IMPORT{program}="BINDIR/mdadm --detail --export $tempnode"
+--- a/udev-md-raid-assembly.rules
++++ b/udev-md-raid-assembly.rules
+@@ -30 +30 @@
+-ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $devnode --offroot ${DEVLINKS}"
++ACTION=="add|change", IMPORT{program}="BINDIR/mdadm --incremental --export $tempnode --offroot ${DEVLINKS}"