This commit was manufactured by cvs2git to create branch 'RA-branch'.

Sprout from master 2003-09-06 20:16:09 UTC Paweł Gołaszewski <blues@pld-linux.org> '- release 2'
Cherrypick from master 2002-09-07 19:46:07 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- new':
    mdadm-dev0.patch -> 1.1
Cherrypick from master 2004-07-13 09:57:50 UTC Jakub Bogusz <qboosh@pld-linux.org> '- allow to start array with disk missing':
    mdadm-degraded.patch -> 1.1

diff --git a/mdadm-degraded.patch b/mdadm-degraded.patch
new file mode 100644 (file)
index 0000000..2e6ea95
--- /dev/null
+++ b/mdadm-degraded.patch
@@ -0,0 +1,21 @@
+--- mdadm-1.6.0/Assemble.c.orig        Fri Jun  4 08:18:28 2004
++++ mdadm-1.6.0/Assemble.c     Tue Jul 13 10:33:52 2004
+@@ -253,14 +253,14 @@
+                */
+ 
+               if (!havesuper) {
+-                      fprintf(stderr, Name ": %s has no superblock - assembly aborted\n",
++                      fprintf(stderr, Name ": %s has no superblock - device ignored\n",
+                               devname);
+-                      return 1;
++                      continue;
+               }
+               if (compare_super(&first_super, &super)) {
+-                      fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
++                      fprintf(stderr, Name ": superblock on %s doesn't match others - device ignored\n",
+                               devname);
+-                      return 1;
++                      continue;
+               }
+ 
+ 

diff --git a/mdadm-dev0.patch b/mdadm-dev0.patch
new file mode 100644 (file)
index 0000000..7b25c31
--- /dev/null
+++ b/mdadm-dev0.patch
@@ -0,0 +1,12 @@
+diff -urN mdadm-1.0.1.org/Monitor.c mdadm-1.0.1/Monitor.c
+--- mdadm-1.0.1.org/Monitor.c  Sat Sep  7 21:10:30 2002
++++ mdadm-1.0.1/Monitor.c      Sat Sep  7 21:11:01 2002
+@@ -271,7 +271,7 @@
+               if (scan) {
+                       struct mdstat_ent *mse;
+                       for (mse=mdstat; mse; mse=mse->next) 
+-                              if (mse->devnum > 0) {
++                              if (mse->devnum >= 0) {
+                                       struct state *st = malloc(sizeof *st);
+                                       if (st == NULL)
+                                               continue;