rpms/mdadm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Slight fix on container patch

Browse Source
This commit is contained in:
Doug Ledford 2010-04-08 21:35:32 +00:00
parent 31c5bf74cb
commit d6f29f1fb8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mdadm-3.1.2-container-2.patch
View File

@ -1,6 +1,6 @@
commit 3e77dfbe97a30d97c42787b15e7a9c703fda0431 commit e750ad9d6fbd4e6606681a9c81b9a99994255940
Author: Doug Ledford <dledford@redhat.com> Author: Doug Ledford <dledford@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 Don't even try to activate non-redundant array types unless all disks
are present. This keeps arrays from getting marked as broken in 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@redhat.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
diff --git a/Assemble.c b/Assemble.c diff --git a/Assemble.c b/Assemble.c
index d059155..9580066 100644 index d059155..81178da 100644
--- a/Assemble.c --- a/Assemble.c
+++ b/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_LINEAR:
case LEVEL_MULTIPATH: case LEVEL_MULTIPATH:
case 0: case 0:
@ -21,6 +21,8 @@ index d059155..9580066 100644
+ if ((working + preexist) == content->array.raid_disks) + if ((working + preexist) == content->array.raid_disks)
+ err = sysfs_set_str(content, NULL, + err = sysfs_set_str(content, NULL,
+ "array_state", "active"); + "array_state", "active");
+ else
+ err = 1;
break; break;
default: default:
err = sysfs_set_str(content, NULL, "array_state", err = sysfs_set_str(content, NULL, "array_state",

9
mdadm.spec
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.2 Version: 3.1.2
Release: 8%{?dist} Release: 9%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2 Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
Source1: mdmonitor.init Source1: mdmonitor.init
Source2: raid-check Source2: raid-check
@ -17,6 +17,7 @@ Patch7: mdadm-3.1.2-decremental-2.patch
Patch8: mdadm-3.1.2-decremental-3.patch Patch8: mdadm-3.1.2-decremental-3.patch
Patch9: mdadm-3.1.2-powerpc-compile.patch Patch9: mdadm-3.1.2-powerpc-compile.patch
Patch10: mdadm-3.1.2-container.patch Patch10: mdadm-3.1.2-container.patch
Patch11: mdadm-3.1.2-container-2.patch
Patch20: mdadm-2.5.2-static.patch Patch20: mdadm-2.5.2-static.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+ License: GPLv2+
@ -47,7 +48,8 @@ file can be used to help with some common tasks.
%patch7 -p1 -b .decremental-2 %patch7 -p1 -b .decremental-2
%patch8 -p1 -b .decremental-3 %patch8 -p1 -b .decremental-3
%patch9 -p1 -b .powerpc %patch9 -p1 -b .powerpc
%patch10 -p1 -b .contrainer %patch10 -p1 -b .container
%patch11 -p1 -b .container-2
%patch20 -p1 -b .static %patch20 -p1 -b .static
%build %build
@ -95,6 +97,9 @@ fi
%attr(0700,root,root) %dir /var/run/mdadm %attr(0700,root,root) %dir /var/run/mdadm
%changelog %changelog
* Thu Apr 08 2010 Doug Ledford <dledford@redhat.com> - 3.1.2-9
- Slight fix on container patch
* Thu Apr 08 2010 Doug Ledford <dledford@redhat.com> - 3.1.2-8 * Thu Apr 08 2010 Doug Ledford <dledford@redhat.com> - 3.1.2-8
- Updated container patch that also enables mdadm -IRs for imsm devices - Updated container patch that also enables mdadm -IRs for imsm devices