pool/mdadm
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=14

Browse Source
This commit is contained in:
OBS User unknown 2008-09-24 15:12:07 +00:00 committed by Git OBS Bridge
parent 2a2b8cdec6
commit c21a699aca
6 changed files with 51 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mdadm-2.6.7-56f8add2.patch
View File

@ -1,31 +0,0 @@
commit 56f8add211a840faaed325bd16483b55da544e93
Author: Neil Brown <neilb@suse.de>
Date: Thu Jun 19 16:30:36 2008 +1000
Fix an error when assembling arrays that are in the middle of a reshape.
It is important that dup_super always returns an 'st' with the same
->ss and ->minor_version as the st that was passed.
This wasn't happening for 0.91 metadata (i.e. in the middle of a reshape).
diff --git a/super0.c b/super0.c
index 7e81482..8e4c568 100644
--- a/super0.c
+++ b/super0.c
@@ -849,12 +849,15 @@ static struct supertype *match_metadata_desc0(char *arg)
st->sb = NULL;
if (strcmp(arg, "0") == 0 ||
strcmp(arg, "0.90") == 0 ||
- strcmp(arg, "0.91") == 0 ||
strcmp(arg, "default") == 0 ||
strcmp(arg, "") == 0 /* no metadata */
)
return st;
+ st->minor_version = 91; /* reshape in progress */
+ if (strcmp(arg, "0.91") == 0) /* For dup_super support */
+ return st;
+
st->minor_version = 9; /* flag for 'byte-swapped' */
if (strcmp(arg, "0.swap")==0 ||
strcmp(arg, "0.9") == 0) /* For dup_super support */

24
mdadm-2.6.7-60b435db.patch
View File

@ -1,24 +0,0 @@
commit 60b435db5a7b085ad1204168879037bf14ebd6d1
Author: Chris Webb <chris@arachsys.com>
Date: Thu Jun 19 16:30:39 2008 +1000
Fix bug in forced assemble.
From: Chris Webb <chris@arachsys.com>
We are loading into the already-loaded 'st' instead of the
newly create 'tst', which is clearly wrong.
diff --git a/Assemble.c b/Assemble.c
index 36b2304..79f0912 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -656,7 +656,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
continue;
}
tst = dup_super(st);
- if (tst->ss->load_super(st,fd, NULL)) {
+ if (tst->ss->load_super(tst,fd, NULL)) {
close(fd);
fprintf(stderr, Name ": RAID superblock disappeared from %s - not updating.\n",
devices[chosen_drive].devname);

3
mdadm-2.6.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f2ec116bb1fc0102861796bc56777e751ea65202b460b0d43ae6ad277def807e
size 153982

3
mdadm-3.0-devel1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d996c9f69429fcb746a1bc7665ee8c413906996a75c2baeff7e9573487be7521
size 236945

23
mdadm.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Sep 19 11:14:05 CEST 2008 - mmarek@suse.cz
- added /var/run/mdadm for mdmon
- fixed build
-------------------------------------------------------------------
Thu Sep 18 09:33:19 CEST 2008 - nfbrown@suse.de
- update to mdadm-3.0-devel1
package version number is set to 3.0 to avodi future confusion.
This is a substantial update that provides support for handling
the metadata entirely in userspace and thus making easier to
handle a variety of metadata formats. Support is included for
DDF and for the Intel Matrix metadata used by recent ICH chipsets.
An extra program 'mdmon' is needed and included. It is run to
monitor any array using 'external' (to the kernel) metadata
and will update the metadata in response to device failures etc.
This is required for FATE 304219
-------------------------------------------------------------------
Wed Sep 3 11:09:34 CEST 2008 - hare@suse.de

37
mdadm.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package mdadm (Version 2.6.7)
# spec file for package mdadm (Version 3.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,26 +19,25 @@
Name: mdadm
Version: 2.6.7
Release: 22
Version: 3.0
Release: 1
%define ver 3.0-devel1
BuildRequires: sgmltool
PreReq: %fillup_prereq %insserv_prereq
Obsoletes: raidtools
AutoReqProv: on
Group: System/Base
License: GPL v2 or later
Url: http://www.cse.unsw.edu.au/~neilb/source/mdadm/
Url: http://www.kernel.org/pub/linux/utils/mdadm/
Summary: Utility for Configuring MD Setup
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
Source: %{name}-%{ver}.tar.bz2
Source1: Software-RAID.HOWTO.tar.bz2
Source2: sysconfig.mdadm
Source3: mdadmd
Source4: boot.md
Source5: mkinitrd-setup.sh
Source6: mkinitrd-boot.sh
Patch1: mdadm-2.6.7-56f8add2.patch
Patch2: mdadm-2.6.7-60b435db.patch
%description
Mdadm is a program that can be used to control Linux md devices. It is
@ -49,12 +48,10 @@ programs but with a very different interface.
Authors:
--------
Neil Brown <neilb@cse.unsw.edu.au>
Neil Brown <neilb@suse.de>
%prep
%setup -q -a1
%patch1 -p1
%patch2 -p1
%setup -q -a1 -n %{name}-%{ver}
%build
%{suse_update_config -f}
@ -74,6 +71,7 @@ install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-md.sh
install -m 755 %{S:6} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-md.sh
install -m 644 %{S:2} $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/
ln -sf ../../etc/init.d/mdadmd $RPM_BUILD_ROOT/%{_sbindir}/rcmdadmd
install -d $RPM_BUILD_ROOT/var/run/mdadm
%post
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
@ -125,19 +123,34 @@ rm -rf $RPM_BUILD_ROOT
%attr(640,root,disk) %dev(b,9,29) /lib/udev/devices/md29
%attr(640,root,disk) %dev(b,9,30) /lib/udev/devices/md30
%attr(640,root,disk) %dev(b,9,31) /lib/udev/devices/md31
%doc ANNOUNCE-2.0 ANNOUNCE-2.1 ANNOUNCE-2.2 COPYING ChangeLog README.initramfs TODO mdadm.conf-example mkinitramfs
%doc COPYING ChangeLog README.initramfs TODO mdadm.conf-example mkinitramfs
%doc Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html}
%doc %{_mandir}/man?/*
/sbin/*
/lib/udev
%{_sbindir}/*
%{_var}/adm/fillup-templates/sysconfig.mdadm
%dir /var/run/mdadm
%dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/setup-md.sh
/lib/mkinitrd/scripts/boot-md.sh
%changelog
* Fri Sep 19 2008 mmarek@suse.cz
- added /var/run/mdadm for mdmon
- fixed build
* Thu Sep 18 2008 nfbrown@suse.de
- update to mdadm-3.0-devel1
package version number is set to 3.0 to avodi future confusion.
This is a substantial update that provides support for handling
the metadata entirely in userspace and thus making easier to
handle a variety of metadata formats. Support is included for
DDF and for the Intel Matrix metadata used by recent ICH chipsets.
An extra program 'mdmon' is needed and included. It is run to
monitor any array using 'external' (to the kernel) metadata
and will update the metadata in response to device failures etc.
This is required for FATE 304219
* Wed Sep 03 2008 hare@suse.de
- Call mkinitrd_setup during %%post and %%postun (bnc#413709)
* Sun Aug 17 2008 aj@suse.de