rpms/mdadm/F-12 mdadm-3.1.1-imsm.patch,1.1,1.2 mdadm.spec,1.80,1.81

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17739

Modified Files:
	mdadm-3.1.1-imsm.patch mdadm.spec 
Log Message:
* Tue Feb 23 2010 Doug Ledford <dledford at redhat.com> - 3.1.1-0.gcd9a8b5.6
- Newer version of imsm patch that leaves warning, but only when there
  actually are too many devices on the command line (bz554974)


mdadm-3.1.1-imsm.patch:
 Assemble.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: mdadm-3.1.1-imsm.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm-3.1.1-imsm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mdadm-3.1.1-imsm.patch	21 Feb 2010 15:32:17 -0000	1.1
+++ mdadm-3.1.1-imsm.patch	23 Feb 2010 15:02:29 -0000	1.2
@@ -1,18 +1,13 @@
 diff --git a/Assemble.c b/Assemble.c
-index e4d6181..72f7942 100644
+index e4d6181..23cc438 100644
 --- a/Assemble.c
 +++ b/Assemble.c
-@@ -434,13 +434,6 @@ int Assemble(struct supertype *st, char *mddev,
+@@ -434,7 +434,7 @@ int Assemble(struct supertype *st, char *mddev,
  				}
  			}
  			st = tst; tst = NULL;
 -			if (!auto_assem && tmpdev->next != NULL) {
--				fprintf(stderr, Name ": %s is a container, but is not "
--					"only device given: confused and aborting\n",
--					devname);
--				st->ss->free_super(st);
--				return 1;
--			}
- 			if (verbose > 0)
- 				fprintf(stderr, Name ": found match on member %s in %s\n",
- 					content->text_version, devname);
++			if (!auto_assem && inargv && tmpdev->next != NULL) {
+ 				fprintf(stderr, Name ": %s is a container, but is not "
+ 					"only device given: confused and aborting\n",
+ 					devname);


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- mdadm.spec	22 Feb 2010 00:28:11 -0000	1.80
+++ mdadm.spec	23 Feb 2010 15:02:29 -0000	1.81
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.1.1
-Release:     0.gcd9a8b5.5%{?dist}
+Release:     0.gcd9a8b5.6%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -81,6 +81,10 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Tue Feb 23 2010 Doug Ledford <dledford at redhat.com> - 3.1.1-0.gcd9a8b5.6
+- Newer version of imsm patch that leaves warning, but only when there
+  actually are too many devices on the command line (bz554974)
+
 * Sun Feb 21 2010 Doug Ledford <dledford at redhat.com> - 3.1.1-0.gcd9a8b5.5
 - The uuid patch cause a different problem during assembly, so use a gross
   hack to work around the uuid issue that won't break assembly until fixed