Report uuid in --detail --brief for ddf and intel

[thirdparty/mdadm.git] / Incremental.c

diff --git a/Incremental.c b/Incremental.c
index 869ae8396802f81a729e3678d60de55362f38b03..6474e796bf5af69d3f83225717ab5eb41080b942 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -233,7 +233,7 @@ int Incremental(char *devname, int verbose, int runstop,
        mp = map_by_uuid(&map, info.uuid);
 
        if (uuid_for_name && ! mp) {
        mp = map_by_uuid(&map, info.uuid);
 
        if (uuid_for_name && ! mp) {

-               name_to_use = fname_from_uuid(st, &info, nbuf);
+               name_to_use = fname_from_uuid(st, &info, nbuf, '-');

                if (verbose >= 0)
                        fprintf(stderr, Name
                ": not found in mdadm.conf and not identified by homehost"
                if (verbose >= 0)
                        fprintf(stderr, Name
                ": not found in mdadm.conf and not identified by homehost"


@@ -804,7 +804,7 @@ int Incremental_container(struct supertype *st, char *devname, int verbose,
                    ! *name_to_use ||
                    (*devname != '/' || strncmp("UUID-", strrchr(devname,'/')+1,5) == 0)
                        )
                    ! *name_to_use ||
                    (*devname != '/' || strncmp("UUID-", strrchr(devname,'/')+1,5) == 0)
                        )

-                       name_to_use = fname_from_uuid(st, ra, nbuf);
+                       name_to_use = fname_from_uuid(st, ra, nbuf, '-');

                    
                if (mp)
                        devnum = mp->devnum;
                    
                if (mp)
                        devnum = mp->devnum;