diff options
-rw-r--r-- | Detail.c | 6 | ||||
-rw-r--r-- | super0.c | 5 | ||||
-rw-r--r-- | super1.c | 3 |
3 files changed, 10 insertions, 4 deletions
@@ -138,7 +138,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost) if (sra && sra->array.major_version < 0) printf("MD_METADATA=%s\n", sra->text_version); else - printf("MD_METADATA=%02d.%02d\n", + printf("MD_METADATA=%d.%02d\n", array.major_version, array.minor_version); if (st && st->sb) @@ -153,7 +153,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost) if (sra && sra->array.major_version < 0) printf(" metadata=%s", sra->text_version); else - printf(" metadata=%02d.%02d", + printf(" metadata=%d.%02d", array.major_version, array.minor_version); } else { mdu_bitmap_file_t bmf; @@ -175,7 +175,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost) if (sra && sra->array.major_version < 0) printf(" Version : %s\n", sra->text_version); else - printf(" Version : %02d.%02d\n", + printf(" Version : %d.%02d\n", array.major_version, array.minor_version); atime = array.ctime; @@ -93,7 +93,7 @@ static void examine_super0(struct supertype *st, char *homehost) char *c; printf(" Magic : %08x\n", sb->md_magic); - printf(" Version : %02d.%02d.%02d\n", sb->major_version, sb->minor_version, + printf(" Version : %d.%02d.%02d\n", sb->major_version, sb->minor_version, sb->patch_version); if (sb->minor_version >= 90) { printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1, @@ -847,6 +847,9 @@ static struct supertype *match_metadata_desc0(char *arg) st->minor_version = 90; st->max_devs = MD_SB_DISKS; st->sb = NULL; + /* Eliminate pointless leading 0 from some versions of mdadm -D */ + if (strncmp(arg, "00.", 3) == 0) + arg++; if (strcmp(arg, "0") == 0 || strcmp(arg, "0.90") == 0 || strcmp(arg, "0.91") == 0 || @@ -1186,6 +1186,9 @@ static struct supertype *match_metadata_desc1(char *arg) st->ss = &super1; st->max_devs = 384; st->sb = NULL; + /* Eliminate pointless leading 0 from some versions of mdadm -D */ + if (strncmp(arg, "01.", 3) == 0) + arg++; if (strcmp(arg, "1.0") == 0) { st->minor_version = 0; return st; |