martin f. krafft: preparing 3.1.4-1

[Martin F. Krafft]

Module: mdadm
Branch: build
Commit: 6b57ea34556d4f5efe0494986b4d175078cc14cf
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=6b57ea34556d4f5efe0494986b4d175078cc14cf

Author: martin f. krafft <madduck at debian.org>
Date:   Thu Sep  2 16:22:20 2010 +0200

preparing 3.1.4-1

---

 debian/patches/debian/conffile-location.diff   |   10 +++---
 debian/patches/debian/disable-incremental.diff |   47 ++++++++++++++++++++++++
 debian/patches/series                          |    1 +
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/debian/patches/debian/conffile-location.diff b/debian/patches/debian/conffile-location.diff
index 436bff3..b51557f 100644
--- a/debian/patches/debian/conffile-location.diff
+++ b/debian/patches/debian/conffile-location.diff
@@ -18,7 +18,7 @@ Reviewed-by: martin f. krafft <madduck at debian.org>
  5 files changed, 11 insertions(+), 13 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index fd274f1..44ee800 100644
+index e2c65a5..0e85ccb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -60,8 +60,8 @@ else
@@ -33,7 +33,7 @@ index fd274f1..44ee800 100644
  CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\"
  # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the
 diff --git a/ReadMe.c b/ReadMe.c
-index 7379568..8bde113 100644
+index b97c55e..aa26032 100644
 --- a/ReadMe.c
 +++ b/ReadMe.c
 @@ -560,7 +560,7 @@ char Help_incr[] =
@@ -46,7 +46,7 @@ index 7379568..8bde113 100644
  " start with a hash(#), four sorts of configuration lines: array lines, \n"
  " device lines, mailaddr lines and program lines.\n"
 diff --git a/mdadm.8.in b/mdadm.8.in
-index 9e352da..ee7169d 100644
+index d911cb3..d267b8c 100644
 --- a/mdadm.8.in
 +++ b/mdadm.8.in
 @@ -261,9 +261,9 @@ the exact meaning of this option in different contexts.
@@ -112,7 +112,7 @@ index e677ba9..648d26a 100644
  .PP
  .I mdadm
 diff --git a/mdassemble.8 b/mdassemble.8
-index 1904e66..dffadba 100644
+index 986432c..d06c201 100644
 --- a/mdassemble.8
 +++ b/mdassemble.8
 @@ -40,7 +40,7 @@ There are no options to
@@ -125,4 +125,4 @@ index 1904e66..dffadba 100644
  The config file lists which devices may be scanned to see if
  they contain MD super block, and gives identifying information
 -- 
-tg: (850a317..) debian/conffile-location (depends on: upstream)
+tg: (972ee72..) debian/conffile-location (depends on: upstream)
diff --git a/debian/patches/debian/disable-incremental.diff b/debian/patches/debian/disable-incremental.diff
new file mode 100644
index 0000000..3b3239c
--- /dev/null
+++ b/debian/patches/debian/disable-incremental.diff
@@ -0,0 +1,47 @@
+From: martin f. krafft <madduck at debian.org>
+Subject: Disable udev incremental assembly
+
+Upstream enabled incremental assembly in the udev rules by default for 3.1.3,
+but this is too early given the pending release of squeeze. Hence, this patch
+simply reverts the change.
+
+Signed-off-by: martin f. krafft <madduck at debian.org>
+
+---
+ udev-md-raid.rules |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/udev-md-raid.rules b/udev-md-raid.rules
+index f9607f3..c9a4f0e 100644
+--- a/udev-md-raid.rules
++++ b/udev-md-raid.rules
+@@ -1,13 +1,13 @@
+ # do not edit this file, it will be overwritten on update
+ 
+ SUBSYSTEM!="block", GOTO="md_end"
+-
+-# handle potential components of arrays
+-ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="remove", RUN+="/sbin/mdadm -If $name"
+-ENV{ID_FS_TYPE}=="linux_raid_member", ACTION=="add", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
+-
+-# handle md arrays
+ ACTION!="add|change", GOTO="md_end"
++ACTION=="change", GOTO="md_no_incr"
++
++# import data from a raid member and activate it
++#ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
++# import data from a raid set
++LABEL="md_no_incr"
+ KERNEL!="md*", GOTO="md_end"
+ 
+ # partitions have no md/{array_state,metadata_version}, but should not
+@@ -32,7 +32,6 @@ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNA
+ 
+ IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+ OPTIONS+="link_priority=100"
+-OPTIONS+="watch"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+ 
+-- 
+tg: (deb573e..) debian/disable-incremental (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 2200393..c901f61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ contrib/docs/superblock_formats.diff -p1
 contrib/docs/md.txt.diff -p1
 contrib/docs/jd-rebuilding-raid.diff -p1
 debian/conffile-location.diff -p1
+debian/disable-incremental.diff -p1