Release 2.4-pre1

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/Assemble.c b/Assemble.c
index 480c512cd5cdfe06576b101987ce57b1e704bcf4..2dca21df996db335f2120f9c3293ed9552688a4c 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -568,6 +568,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
         * that was moved aside due to the reshape overwriting live data
         * The code of doing this lives in Grow.c
         */
+#ifndef MDASSEMBLE
        if (info.reshape_active) {
                int err = 0;
                int *fdlist = malloc(sizeof(int)* bestcnt);
@@ -595,6 +596,7 @@ int Assemble(struct supertype *st, char *mddev, int mdfd,
                        return err;
                }
        }
+#endif
        /* count number of in-sync devices according to the superblock.
         * We must have this number to start the array without -s or -R
         */

diff --git a/Makefile b/Makefile
index 3e18f9d04ef84b8b7beac3fdf0ae9437920291b1..6b647134ae5e72ff9a519244e0235348601f9e77 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ install : mdadm mdadm.8 md.4 mdadm.conf.5
 clean : 
        rm -f mdadm $(OBJS) core *.man mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \
        mdassemble mdassemble.static mdassemble.uclibc mdassemble.klibc swap_super \
-       init.cpio.gz mdadm.uclibc.static
+       init.cpio.gz mdadm.uclibc.static test_stripe
 
 dist : clean
        ./makedist

diff --git a/ReadMe.c b/ReadMe.c
index 2e13b5d92e6f127a5f5d68a30f8e88fc30998650..c508a36e88b992dba8668b27066459f3486de0a6 100644 (file)
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -30,7 +30,7 @@
 
 #include "mdadm.h"
 
-char Version[] = Name " - v2.3.1 - 6 February 2006\n";
+char Version[] = Name " - v2.4-pre1 - Not For Production Use - 20 March 2006\n";
 
 /*
  * File: ReadMe.c

diff --git a/inventory b/inventory
index f885957fafd850e3db58172684d42b9804c81290..ad777cfbe3cd5f48eacfa3184ccefc76fda73722 100644 (file)
--- a/inventory
+++ b/inventory
@@ -4,6 +4,7 @@ ANNOUNCE-2.1
 ANNOUNCE-2.2
 ANNOUNCE-2.3
 ANNOUNCE-2.3.1
+ANNOUNCE-2.4-pre1
 Assemble.c
 Build.c
 COPYING
@@ -45,9 +46,11 @@ misc/
 misc/syslog-events
 mkinitramfs
 raid5extend.c
+restripe.c
 super0.c
 super1.c
 swap_super.c
+sysfs.c
 test
 tests/
 tests/00linear
@@ -87,6 +90,7 @@ tests/06name
 tests/06r5swap
 tests/06sysfs
 tests/06wrmostly
+tests/07testreshape5
 tests/ToTest
 tests/check
 tests/testdev

diff --git a/makedist b/makedist
index b7fbc8e8ce166256980f1a199addd891172bc069..db83021873b5bf3b392acbda8e78f8bcb4e1936c 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -19,7 +19,8 @@ grep "^.TH MDADM 8 .. v$version" mdadm.8 > /dev/null 2>&1 ||
    echo mdadm.8 does not mention verion $version.
    exit 1
  }
-grep "^Version: *$version$" mdadm.spec > /dev/null 2>&1 || 
+rpmv=`echo $version | tr - _`
+grep "^Version: *$rpmv$" mdadm.spec > /dev/null 2>&1 ||
  {
    echo mdadm.spec does not mention version $version.
    exit 1

diff --git a/mdadm.8 b/mdadm.8
index 15cc178ee90e4d33858ab87afe9fe80808d23bdf..6ef79aed86f009d8133e04d931a4b03bbd670a48 100644 (file)
--- a/mdadm.8
+++ b/mdadm.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH MDADM 8 "" v2.3.1
+.TH MDADM 8 "" v2.4-pre1
 .SH NAME
 mdadm \- manage MD devices
 .I aka

diff --git a/mdadm.spec b/mdadm.spec
index 86482571760edb83543c4ca5bd49c80a2208dd05..c14eab76b23719cec8eec46acb74c75a825c7cbb 100644 (file)
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,8 +1,9 @@
 Summary:     mdadm is used for controlling Linux md devices (aka RAID arrays)
 Name:        mdadm
-Version:     2.3.1
+Version:     2.4_pre1
 Release:     1
-Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
+#Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
+Source:      http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-2.4-pre1.tgz
 URL:         http://www.cse.unsw.edu.au/~neilb/source/mdadm/
 License:     GPL
 Group:       Utilities/System
@@ -19,7 +20,7 @@ configuration file (that a config file can be used to help with
 some common tasks).
 
 %prep
-%setup -q
+%setup -q -n mdadm-2.4-pre1
 # we want to install in /sbin, not /usr/sbin...
 %define _exec_prefix %{nil}
 

diff --git a/mdassemble.8 b/mdassemble.8
index f2aea6876e2242ded73b2db1c5f68e8f7f3738f2..d4824184ad75468a75595d0b0f28fbc097582ed5 100644 (file)
--- a/mdassemble.8
+++ b/mdassemble.8
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.TH MDASSEMBLE 8 "" v2.3.1
+.TH MDASSEMBLE 8 "" v2.4-pre1
 .SH NAME
 mdassemble \- assemble MD devices
 .I aka