volume_id: LVM - add uuid

[elogind.git] / extras / volume_id / lib / util.c

diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index 395e81bbf3883c52dbfc418ee3807927a2d7ca27..c094661cccd12a602d15a427f37924472d750842 100644 (file)
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -274,9 +274,12 @@ void volume_id_set_uuid(struct volume_id *id, const uint8_t *buf, size_t len, en
        case UUID_DCE:
                count = 16;
                break;
        case UUID_DCE:
                count = 16;
                break;

-       case UUID_FOURINT:
+       case UUID_MD:

                count = 35;
                break;
                count = 35;
                break;

+       case UUID_LVM:
+               count = 32;
+               break;

        }
        memcpy(id->uuid_raw, buf, count);
        id->uuid_raw_len = count;
        }
        memcpy(id->uuid_raw, buf, count);
        id->uuid_raw_len = count;


@@ -324,7 +327,7 @@ set:
                memcpy(id->uuid, buf, count);
                id->uuid[count] = '\0';
                break;
                memcpy(id->uuid, buf, count);
                id->uuid[count] = '\0';
                break;

-       case UUID_FOURINT:
+       case UUID_MD:

                sprintf(id->uuid,
                        "%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x",
                        buf[0], buf[1], buf[2], buf[3],
                sprintf(id->uuid,
                        "%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x",
                        buf[0], buf[1], buf[2], buf[3],


@@ -332,6 +335,17 @@ set:
                        buf[8], buf[9], buf[10], buf[11],
                        buf[12], buf[13], buf[14],buf[15]);
                break;
                        buf[8], buf[9], buf[10], buf[11],
                        buf[12], buf[13], buf[14],buf[15]);
                break;

+       case UUID_LVM:
+               sprintf(id->uuid,
+                       "%c%c%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c-%c%c%c%c%c%c",
+                       buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
+                       buf[6], buf[7], buf[8], buf[9],
+                       buf[10], buf[11], buf[12], buf[13],
+                       buf[14], buf[15], buf[16], buf[17],
+                       buf[18], buf[19], buf[20], buf[21],
+                       buf[22], buf[23], buf[24], buf[25],
+                       buf[26], buf[27], buf[28], buf[29], buf[30], buf[31]);
+               break;

        }
 }
 
        }
 }