45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
|
From a8b25633544db9fb03bc3b12442aafbbae9c1e1c Mon Sep 17 00:00:00 2001
|
||
|
|
From: "mwilck@arcor.de" <mwilck@arcor.de>
|
||
|
|
Date: Wed, 11 Sep 2013 21:55:35 +0200
|
||
|
|
Subject: [PATCH] DDF: brief_examine_subarrays_ddf: print array name
|
||
|
|
|
||
|
|
Print an array name in brief output, like IMSM does.
|
||
|
|
|
||
|
|
SUSE's YaST2 (libstorage) needs this in order to detect MD arrays
|
||
|
|
during installation.
|
||
|
|
|
||
|
|
Signed-off-by: Martin Wilck <mwilck@arcor.de>
|
||
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
||
|
|
---
|
||
|
|
super-ddf.c | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- mdadm-3.3.orig/super-ddf.c
|
||
|
|
+++ mdadm-3.3/super-ddf.c
|
||
|
|
@@ -1519,6 +1519,7 @@ static void getinfo_super_ddf(struct sup
|
||
|
|
|
||
|
|
static void uuid_from_ddf_guid(const char *guid, int uuid[4]);
|
||
|
|
static void uuid_from_super_ddf(struct supertype *st, int uuid[4]);
|
||
|
|
+static void _ddf_array_name(char *name, const struct ddf_super *ddf, int i);
|
||
|
|
|
||
|
|
static unsigned int get_vd_num_of_subarray(struct supertype *st)
|
||
|
|
{
|
||
|
|
@@ -1578,13 +1579,16 @@ static void brief_examine_subarrays_ddf(
|
||
|
|
struct virtual_entry *ve = &ddf->virt->entries[i];
|
||
|
|
struct vcl vcl;
|
||
|
|
char nbuf1[64];
|
||
|
|
+ char namebuf[17];
|
||
|
|
if (all_ff(ve->guid))
|
||
|
|
continue;
|
||
|
|
memcpy(vcl.conf.guid, ve->guid, DDF_GUID_LEN);
|
||
|
|
ddf->currentconf =&vcl;
|
||
|
|
uuid_from_super_ddf(st, info.uuid);
|
||
|
|
fname_from_uuid(st, &info, nbuf1, ':');
|
||
|
|
- printf("ARRAY container=%s member=%d UUID=%s\n",
|
||
|
|
+ _ddf_array_name(namebuf, ddf, i);
|
||
|
|
+ printf("ARRAY%s%s container=%s member=%d UUID=%s\n",
|
||
|
|
+ namebuf[0] == '\0' ? "" : " /dev/md/", namebuf,
|
||
|
|
nbuf+5, i, nbuf1+5);
|
||
|
|
}
|
||
|
|
}
|