Don't give array name in --examine --brief output if it is doubtful.

Now that mdadm.conf doesn't need an array name, we don't need to
give one if the array cannot reliably provide one.

diff --git a/super-ddf.c b/super-ddf.c
index 4264bdf726984161af95874583a01d340764c6ff..98e75ad6948902cbc1a751f853e99c6d8b067471 100644 (file)
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -1137,7 +1137,7 @@ static void brief_examine_super_ddf(struct supertype *st)
        char nbuf[64];
        getinfo_super_ddf(st, &info);
        fname_from_uuid(st, &info, nbuf, ':');
-       printf("ARRAY /dev/ddf metadata=ddf UUID=%s\n", nbuf + 5);
+       printf("ARRAY metadata=ddf UUID=%s\n", nbuf + 5);
 }
 
 static void detail_super_ddf(struct supertype *st, char *homehost)

diff --git a/super-intel.c b/super-intel.c
index f5ce06bdacb055f5373369d076e800eb8e7b983b..7ecc09f85ef3a99493b5278d8b7a43e32e833444 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -611,6 +611,7 @@ static void brief_examine_super_imsm(struct supertype *st)
        /* We just write a generic IMSM ARRAY entry */
        struct mdinfo info;
        char nbuf[64];
+       char nbuf1[64];
        struct intel_super *super = st->sb;
        int i;
 
@@ -619,15 +620,15 @@ static void brief_examine_super_imsm(struct supertype *st)
 
        getinfo_super_imsm(st, &info);
        fname_from_uuid(st, &info, nbuf,'-');
-       printf("ARRAY /dev/imsm metadata=imsm auto=md UUID=%s\n", nbuf + 5);
+       printf("ARRAY metadata=imsm auto=md UUID=%s\n", nbuf + 5);
        for (i = 0; i < super->anchor->num_raid_devs; i++) {
                struct imsm_dev *dev = get_imsm_dev(super, i);
 
                super->current_vol = i;
                getinfo_super_imsm(st, &info);
-               fname_from_uuid(st, &info, nbuf,'-');
-               printf("ARRAY /dev/md/%.16s container=/dev/imsm member=%d auto=mdp UUID=%s\n",
-                      dev->volume, i, nbuf + 5);
+               fname_from_uuid(st, &info, nbuf1,'-');
+               printf("ARRAY /dev/md/%.16s container=%s member=%d auto=mdp UUID=%s\n",
+                      dev->volume, nbuf + 5, i, nbuf1 + 5);
        }
 }
 

diff --git a/super1.c b/super1.c
index 4cfd786009a6c9a8b24c944d0fea9f44f04b3321..3d392cb05c996dc96f0156c11dd0103707e10be6 100644 (file)
--- a/super1.c
+++ b/super1.c
@@ -353,9 +353,11 @@ static void brief_examine_super1(struct supertype *st)
        else if (sb->set_name[0])
                nm = sb->set_name;
        else
-               nm = "??";
+               nm = NULL;
 
-       printf("ARRAY /dev/md/%s level=%s ", nm, c?c:"-unknown-");
+       printf("ARRAY%s%s level=%s ",
+              nm ? " /dev/md/":"", nm,
+              c?c:"-unknown-");
        sb_offset = __le64_to_cpu(sb->super_offset);
        if (sb_offset <= 4)
                printf("metadata=1.1 ");