d2d5049c1
S-G Bergh
2012-11-05
Subject
blkid: show filesystem when both label and UUID are missing, but type is known
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
util-linux/volume_id/get_devname.c+5 -1
| @@ -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 | |