X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=7bdfda17e7ab5b967ac923935cbee08c7351e140;hp=96ccaf3637511c92db7b86bbffe61b44e5c66300;hb=708cb3594139f28f7d99b4ea1cf91b4ccd032273;hpb=04cc3a81d02af4d131b9c92defd7538f22089774

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 96ccaf363..7bdfda17e 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -291,15 +291,14 @@ int main(int argc, char *argv[])
 		printf("%s\n", vid->type);
 		break;
 	case PRINT_LABEL:
-		if (name[0] == '\0' ||
-		    (vid->usage_id != VOLUME_ID_FILESYSTEM && vid->usage_id != VOLUME_ID_DISKLABEL)) {
+		if (name[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) {
 			rc = 3;
 			goto exit;
 		}
 		printf("%s\n", name);
 		break;
 	case PRINT_UUID:
-		if (vid->uuid[0] == '\0' || vid->usage_id != VOLUME_ID_FILESYSTEM) {
+		if (vid->uuid[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) {
 			rc = 4;
 			goto exit;
 		}