volume_id: add suspend partition detection

[elogind.git] / extras / volume_id / vol_id.c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 96ccaf3637511c92db7b86bbffe61b44e5c66300..7bdfda17e7ab5b967ac923935cbee08c7351e140 100644 (file)
--- 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;
                }