- Fix problem with booting multiple imsm containers when they aren't listed

"just so" in the mdadm.conf file (bz554974)
This commit is contained in:
Doug Ledford 2010-02-21 15:17:14 +00:00
parent 5a027cad75
commit 6a8463e3ea
2 changed files with 25 additions and 1 deletions

18
mdadm-3.1.1-imsm.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/Assemble.c b/Assemble.c
index e4d6181..72f7942 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -434,13 +434,6 @@ 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);

View File

@ -1,7 +1,7 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 3.1.1
Release: 0.gcd9a8b5.3%{?dist}
Release: 0.gcd9a8b5.4%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2
Source1: mdmonitor.init
Source2: raid-check
@ -10,6 +10,7 @@ Source4: mdadm-raid-check-sysconfig
Patch1: mdadm-2.5.2-static.patch
Patch2: mdadm-3.1.1-warn.patch
Patch3: mdadm-3.1.1-endian.patch
Patch4: mdadm-3.1.1-imsm.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+
Group: System Environment/Base
@ -33,6 +34,7 @@ file can be used to help with some common tasks.
%patch1 -p1 -b .static
%patch2 -p1 -b .warn
%patch3 -p1 -b .endian
%patch4 -p1 -b .imsm
%build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@ -79,6 +81,10 @@ fi
%attr(0700,root,root) %dir /var/run/mdadm
%changelog
* Sun Feb 21 2010 Doug Ledford <dledford@redhat.com> - 3.1.1-0.gcd9a8b5.4
- Fix problem with booting multiple imsm containers when they aren't listed
"just so" in the mdadm.conf file (bz554974)
* Fri Feb 19 2010 Doug Ledford <dledford@redhat.com> - 3.1.1-0.gcd9a8b5.3
- Don't run the raid-check script if the kernel doesn't support
md devices (bz557053)