rpms/mdadm/devel mdadm-3.1.2-container-2.patch,1.1,1.2

[Doug Ledford]

Author: dledford

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

Modified 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 |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: mdadm-3.1.2-container-2.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm-3.1.2-container-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mdadm-3.1.2-container-2.patch	8 Apr 2010 21:13:08 -0000	1.1
+++ mdadm-3.1.2-container-2.patch	8 Apr 2010 21:35:28 -0000	1.2
@@ -1,6 +1,6 @@
-commit 3e77dfbe97a30d97c42787b15e7a9c703fda0431
+commit e750ad9d6fbd4e6606681a9c81b9a99994255940
 Author: Doug Ledford <dledford at redhat.com>
-Date:   Thu Apr 8 17:10:08 2010 -0400
+Date:   Thu Apr 8 17:34:47 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
@@ -9,10 +9,10 @@ Date:   Thu Apr 8 17:10:08 2010 -0400
     Signed-off-by: Doug Ledford <dledford at redhat.com>
 
 diff --git a/Assemble.c b/Assemble.c
-index d059155..9580066 100644
+index d059155..81178da 100644
 --- a/Assemble.c
 +++ b/Assemble.c
-@@ -1337,8 +1337,9 @@ int assemble_container_content(struct supertype *st, int mdfd,
+@@ -1337,8 +1337,11 @@ int assemble_container_content(struct supertype *st, int mdfd,
  		case LEVEL_LINEAR:
  		case LEVEL_MULTIPATH:
  		case 0:
@@ -21,6 +21,8 @@ index d059155..9580066 100644
 +			if ((working + preexist) == content->array.raid_disks)
 +				err = sysfs_set_str(content, NULL,
 +						    "array_state", "active");
++			else
++				err = 1;
  			break;
  		default:
  			err = sysfs_set_str(content, NULL, "array_state",