blkid: show filesystem when both label and UUID are missing, but type is known

Signed-off-by: S-G Bergh <sgb@systemasis.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 230102d892d5dd5800279daac382e50b33bc517f..665cb9b6e9cf3e3181829e1d80cf9f47ae5a3264 100644 (file)
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -49,7 +49,11 @@ get_label_uuid(int fd, char **label, char **uuid, const char **type)
        if (volume_id_probe_all(vid, /*0,*/ size) != 0)
                goto ret;
 
-       if (vid->label[0] != '\0' || vid->uuid[0] != '\0') {
+       if (vid->label[0] != '\0' || vid->uuid[0] != '\0'
+#if ENABLE_FEATURE_BLKID_TYPE
+        || vid->type != NULL
+#endif
+       ) {
                *label = xstrndup(vid->label, sizeof(vid->label));
                *uuid  = xstrndup(vid->uuid, sizeof(vid->uuid));
 #if ENABLE_FEATURE_BLKID_TYPE