volume_id: add suspend partition detection

Based on a patch from:
  Scott James Remnant <scott@ubuntu.com>

diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index e93f8b5af5936878471168e1d7b1aa1575f331cf..02be060a623d02e9c90d9bb5c64dac8de622e6c3 100644 (file)
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -13,7 +13,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0
 INSTALL_LIB = ${INSTALL} -m 755
 
 SHLIB_CUR = 0

-SHLIB_REV = 70
+SHLIB_REV = 71

 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 
 SHLIB_AGE = 0
 SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
 

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 21cb2bce8c1ea30b824a9c466974c47fb8c5ac4a..8aca564d7276b8efdccb5f7b40d4accd788593ba 100644 (file)
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -26,14 +26,14 @@
 #include "libvolume_id.h"
 #include "util.h"
 
 #include "libvolume_id.h"
 #include "util.h"
 

-static struct swap_header_v1_2 {
+struct swap_header_v1_2 {

        uint8_t         bootbits[1024];
        uint32_t        version;
        uint32_t        last_page;
        uint32_t        nr_badpages;
        uint8_t         uuid[16];
        uint8_t         volume_name[16];
        uint8_t         bootbits[1024];
        uint32_t        version;
        uint32_t        last_page;
        uint32_t        nr_badpages;
        uint8_t         uuid[16];
        uint8_t         volume_name[16];

-} PACKED *sw;
+} PACKED;

 
 #define LARGEST_PAGESIZE                       0x4000
 
 
 #define LARGEST_PAGESIZE                       0x4000
 


@@ -41,10 +41,11 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
 {
        const uint8_t *buf;
        unsigned int page;
 {
        const uint8_t *buf;
        unsigned int page;

+       struct swap_header_v1_2 *sw;

 
        info("probing at offset 0x%llx", (unsigned long long) off);
 
 
        info("probing at offset 0x%llx", (unsigned long long) off);
 

-       /* the swap signature is at the end of the PAGE_SIZE */
+       /* eek, the swap signature is at the end of the PAGE_SIZE */

        for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
                        buf = volume_id_get_buffer(id, off + page-10, 10);
                        if (buf == NULL)
        for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
                        buf = volume_id_get_buffer(id, off + page-10, 10);
                        if (buf == NULL)


@@ -56,21 +57,34 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
                        }
 
                        if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
                        }
 
                        if (memcmp(buf, "SWAPSPACE2", 10) == 0) {

-                               sw = (struct swap_header_v1_2 *) volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
-                               if (sw == NULL)
-                                       return -1;
+                               id->type = "swap";

                                strcpy(id->type_version, "2");
                                strcpy(id->type_version, "2");

-                               volume_id_set_label_raw(id, sw->volume_name, 16);
-                               volume_id_set_label_string(id, sw->volume_name, 16);
-                               volume_id_set_uuid(id, sw->uuid, UUID_DCE);
-                               goto found;
+                               goto found_label;
+                       }
+
+                       if (memcmp(buf, "S1SUSPEND", 9) == 0) {
+                               id->type = "suspend";
+                               strcpy(id->type_version, "s1suspend");
+                               goto found_label;
+                       }
+
+                       if (memcmp(buf, "ULSUSPEND", 9) == 0) {
+                               id->type = "suspend";
+                               strcpy(id->type_version, "ulsuspend");
+                               goto found_label;

                        }
        }
        return -1;
 
                        }
        }
        return -1;
 

+found_label:
+       sw = (struct swap_header_v1_2 *) volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
+       if (sw != NULL) {
+               volume_id_set_label_raw(id, sw->volume_name, 16);
+               volume_id_set_label_string(id, sw->volume_name, 16);
+               volume_id_set_uuid(id, sw->uuid, UUID_DCE);
+       }
+

 found:
        volume_id_set_usage(id, VOLUME_ID_OTHER);
 found:
        volume_id_set_usage(id, VOLUME_ID_OTHER);

-       id->type = "swap";
-

        return 0;
 }
        return 0;
 }

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:
                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:
                        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;
                }
                        rc = 4;
                        goto exit;
                }