mdctl-v0.4.2

diff --git a/Assemble.c b/Assemble.c
index fe0b99ae7018994980f7ae6ad14692809d8a05d4..e5210ce6dfa2b8973206ff551cc905fa1460dfed 100644 (file)
--- a/Assemble.c
+++ b/Assemble.c
@@ -341,7 +341,7 @@ int Assemble(char *mddev, int mdfd,
                /* First, add the raid disks */
                for (i=0; i<first_super.raid_disks; i++) {
                        int j = best[i];
-                       if (devices[j].uptodate) {
+                       if (j >= 0 && devices[j].uptodate) {
                                mdu_disk_info_t disk;
                                memset(&disk, 0, sizeof(disk));
                                disk.major = devices[j].major;

diff --git a/ReadMe.c b/ReadMe.c
index c28b18baf4116f20bdff94a5bda8cc873a4ddd2f..ccfdaac93cb3f48853930ccd1877207ea6dcbde0 100644 (file)
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -29,7 +29,7 @@
 
 #include "mdctl.h"
 
-char Version[] = Name " - v0.4.1 - 26 July 2001\n";
+char Version[] = Name " - v0.4.2 - 27 July 2001\n";
 /*
  * File: ReadMe.c
  *

diff --git a/TODO b/TODO
index c4d1309a635a4bc0d8d2d6bd5fd3963bcea5cec8..017bcac85d13a7271ca36bb70c566a70784b6fd9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -20,3 +20,6 @@
 
 - when --assemble --scan, if an underlying device is an md device, 
   then try to assemble that device first.
+
+
+- mdctl -S /dev/md0 /dev/md1 gives internal error

diff --git a/config.c b/config.c
index 4437de7b8bb460888036589168fe8c16de0c6b70..2feaae39508f9d7f40dc7de9b854522af747c990 100644 (file)
--- a/config.c
+++ b/config.c
@@ -216,6 +216,7 @@ int devline(char *line)
 }
 
 mddev_uuid_t uuidlist = NULL;
+mddev_uuid_t *uidlp = &uuidlist;
 
 void arrayline(char *line)
 {
@@ -254,8 +255,9 @@ void arrayline(char *line)
        mu = malloc(sizeof(*mu));
        mu->devname = strdup(dev);
        memcpy(mu->uuid, uuid, sizeof(uuid));
-       mu->next = uuidlist;
-       uuidlist = mu;
+       mu->next = NULL;
+       *uidlp = mu;
+       uidlp = &mu->next;
     }
 }