rpms/mdadm/devel mdadm.rules, 1.11, 1.12 mdadm.spec, 1.90, 1.91 mdmonitor.init, 1.11, 1.12

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17468

Modified Files:
	mdadm.rules mdadm.spec mdmonitor.init 
Log Message:
* Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-7
- Fix up directory in mdmonitor init script so that we restart mdmon like we
  are supposed to
- Add a rule to run incremental assembly on containers in case there are
  multiple volumes in a container and we only started some of them in the
  initramfs
- Make -If work with imsm arrays.  We had too restrictive of a test in
  sysfs_unique_holder.



Index: mdadm.rules
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.rules,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mdadm.rules	7 Apr 2010 00:17:01 -0000	1.11
+++ mdadm.rules	7 Apr 2010 13:58:53 -0000	1.12
@@ -3,13 +3,23 @@
 # See udev(8) for syntax
 
 SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
-	RUN+="/sbin/mdadm -I $env{DEVNAME}"
+	RUN+="/sbin/mdadm -I $tempnode"
 SUBSYSTEM=="block", ACTION=="remove", ENV{ID_FS_TYPE}=="linux_raid_member", \
 	RUN+="/sbin/mdadm -If $env{DEVNAME}"
 
 ENV{rd_NO_MDIMSM}=="?*", GOTO="md_imsm_inc_end"
+# In case the initramfs only started some of the arrays in our container,
+# run incremental assembly on the container itself.  Note: we ran mdadm
+# on the container in 64-md-raid.rules, and that's how the MD_LEVEL
+# environment variable is already set.  If that disappears from the other
+# file, we will need to add this line into the middle of the next rule:
+#	IMPORT{program}="/sbin/mdadm -D --export $tempnode", \
+
+SUBSYSTEM=="block", ACTION=="add|change", KERNEL=="md*", \
+	ENV{MD_LEVEL}=="container", RUN+="/sbin/mdadm -I $tempnode"
+
 SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="isw_raid_member", \
-	RUN+="/sbin/mdadm -I $env{DEVNAME}"
+	RUN+="/sbin/mdadm -I $tempnode"
 SUBSYSTEM=="block", ACTION=="remove", ENV{ID_FS_TYPE}=="isw_raid_member", \
 	RUN+="/sbin/mdadm -If $env{DEVNAME}"
 LABEL="md_imsm_inc_end"


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- mdadm.spec	7 Apr 2010 00:17:01 -0000	1.90
+++ mdadm.spec	7 Apr 2010 13:58:53 -0000	1.91
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.1.2
-Release:     6%{?dist}
+Release:     7%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -14,6 +14,7 @@ Patch4:      mdadm-3.1.2-rebuild.patch
 Patch5:      mdadm-3.1.2-directory.patch
 Patch6:      mdadm-3.1.2-decremental.patch
 Patch7:      mdadm-3.1.2-decremental-2.patch
+Patch10:     mdadm-3.1.2-decremental-3.patch
 Patch8:      mdadm-3.1.2-powerpc-compile.patch
 Patch9:      mdadm-2.5.2-static.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
@@ -43,6 +44,7 @@ file can be used to help with some commo
 %patch5 -p1 -b .directory
 %patch6 -p1 -b .decremental
 %patch7 -p1 -b .decremental-2
+%patch10 -p1 -b .decremental-3
 %patch8 -p1 -b .powerpc
 %patch9 -p1 -b .static
 
@@ -91,6 +93,15 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-7
+- Fix up directory in mdmonitor init script so that we restart mdmon like we
+  are supposed to
+- Add a rule to run incremental assembly on containers in case there are
+  multiple volumes in a container and we only started some of them in the
+  initramfs
+- Make -If work with imsm arrays.  We had too restrictive of a test in
+  sysfs_unique_holder.
+
 * Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-6
 - Typo in new rules file
 


Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdmonitor.init,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mdmonitor.init	1 Dec 2009 22:46:16 -0000	1.11
+++ mdmonitor.init	7 Apr 2010 13:58:54 -0000	1.12
@@ -41,9 +41,9 @@ usage ()
 start ()
 {
 # (Re)start mdmon to take over monitoring of mdmon started from the initrd
-    if [ -f /dev/.mdadm/*.pid ]; then
+    if [ -f /dev/md/*.pid ]; then
         origprog="$prog"; prog="mdmon"
-        action $"Starting $prog: " /sbin/mdmon /proc/mdstat /
+        action $"Starting $prog: " /sbin/mdmon --takeover --all
         prog="$origprog"
     fi
 # Make sure configuration file exists and has information we can use