From 877588c6108d1f2a6d77a7916064b7c35edbbced Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Tue, 23 Feb 2010 14:53:10 +0000 Subject: [PATCH] - 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 | 17 ++++++----------- mdadm.spec | 6 +++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/mdadm-3.1.1-imsm.patch b/mdadm-3.1.1-imsm.patch index 336afd5..a5d74ed 100644 --- a/mdadm-3.1.1-imsm.patch +++ b/mdadm-3.1.1-imsm.patch @@ -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); diff --git a/mdadm.spec b/mdadm.spec index 8b30c4b..82e265a 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -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 - 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 - 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