- Newer version of imsm patch that leaves warning, but only when there

actually are too many devices on the command line (bz554974)
This commit is contained in:
Doug Ledford 2010-02-23 14:53:10 +00:00
parent 20929c0606
commit 877588c610
2 changed files with 11 additions and 12 deletions

View File

@ -1,18 +1,13 @@
diff --git a/Assemble.c b/Assemble.c diff --git a/Assemble.c b/Assemble.c
index e4d6181..72f7942 100644 index e4d6181..23cc438 100644
--- a/Assemble.c --- a/Assemble.c
+++ b/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; st = tst; tst = NULL;
- if (!auto_assem && tmpdev->next != NULL) { - if (!auto_assem && tmpdev->next != NULL) {
- fprintf(stderr, Name ": %s is a container, but is not " + if (!auto_assem && inargv && tmpdev->next != NULL) {
- "only device given: confused and aborting\n", fprintf(stderr, Name ": %s is a container, but is not "
- devname); "only device given: confused and aborting\n",
- st->ss->free_super(st); devname);
- 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) Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm Name: mdadm
Version: 3.1.1 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 Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2
Source1: mdmonitor.init Source1: mdmonitor.init
Source2: raid-check Source2: raid-check
@ -81,6 +81,10 @@ fi
%attr(0700,root,root) %dir /var/run/mdadm %attr(0700,root,root) %dir /var/run/mdadm
%changelog %changelog
* Tue Feb 23 2010 Doug Ledford <dledford@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@redhat.com> - 3.1.1-0.gcd9a8b5.5 * Sun Feb 21 2010 Doug Ledford <dledford@redhat.com> - 3.1.1-0.gcd9a8b5.5
- The uuid patch cause a different problem during assembly, so use a gross - 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 hack to work around the uuid issue that won't break assembly until fixed