Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
NeilBrown 2008-11-04 20:50:38 +11:00
parent 1771a6e214
commit cf8de6913b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
super-ddf.c
View File

@ -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)

9
super-intel.c
View File

@ -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);
}
}

6
super1.c
View File

@ -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 ");