From d2d5049c1d1ebb052387790df04740a3857fde63 Mon Sep 17 00:00:00 2001 From: S-G Bergh Date: Mon, 5 Nov 2012 13:16:07 +0100 Subject: blkid: show filesystem when both label and UUID are missing, but type is known Signed-off-by: S-G Bergh Signed-off-by: Denys Vlasenko --- util-linux/volume_id/get_devname.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'util-linux/volume_id') diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c index 230102d89..665cb9b6e 100644 --- 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 -- cgit v1.2.3