rpms/mdadm/F-13 mdadm-3.1.2-container-2.patch, NONE, 1.1 mdadm.spec, 1.87, 1.88

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3368

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.1.2-container-2.patch 
Log Message:
* Thu Apr 08 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-9
- Slight fix on container patch


mdadm-3.1.2-container-2.patch:
 Assemble.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE mdadm-3.1.2-container-2.patch ---
commit 3e77dfbe97a30d97c42787b15e7a9c703fda0431
Author: Doug Ledford <dledford at redhat.com>
Date:   Thu Apr 8 17:10:08 2010 -0400

    Don't even try to activate non-redundant array types unless all disks
    are present.  This keeps arrays from getting marked as broken in
    the superblock and then permanently blocked from being assembled.
    
    Signed-off-by: Doug Ledford <dledford at redhat.com>

diff --git a/Assemble.c b/Assemble.c
index d059155..9580066 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1337,8 +1337,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
 		case LEVEL_LINEAR:
 		case LEVEL_MULTIPATH:
 		case 0:
-			err = sysfs_set_str(content, NULL, "array_state",
-					    "active");
+			if ((working + preexist) == content->array.raid_disks)
+				err = sysfs_set_str(content, NULL,
+						    "array_state", "active");
 			break;
 		default:
 			err = sysfs_set_str(content, NULL, "array_state",


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-13/mdadm.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- mdadm.spec	8 Apr 2010 20:57:35 -0000	1.87
+++ mdadm.spec	8 Apr 2010 21:12:14 -0000	1.88
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.1.2
-Release:     8%{?dist}
+Release:     9%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -17,6 +17,7 @@ Patch7:      mdadm-3.1.2-decremental-2.p
 Patch8:      mdadm-3.1.2-decremental-3.patch
 Patch9:      mdadm-3.1.2-powerpc-compile.patch
 Patch10:     mdadm-3.1.2-container.patch
+Patch11:     mdadm-3.1.2-container-2.patch
 Patch20:     mdadm-2.5.2-static.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -47,7 +48,8 @@ file can be used to help with some commo
 %patch7 -p1 -b .decremental-2
 %patch8 -p1 -b .decremental-3
 %patch9 -p1 -b .powerpc
-%patch10 -p1 -b .contrainer
+%patch10 -p1 -b .container
+%patch11 -p1 -b .container-2
 %patch20 -p1 -b .static
 
 %build
@@ -95,6 +97,9 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Thu Apr 08 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-9
+- Slight fix on container patch
+
 * Thu Apr 08 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-8
 - Updated container patch that also enables mdadm -IRs for imsm devices