volume_id: always check for all filesystem types and skip conflicting results

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

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 7cf3d35396cece01e5397a3aea3cc52949cf42c1..1698e9dbf73a0014b382d9bee38077fdc0c1a740 100644 (file)
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -40,7 +40,7 @@ struct swap_header_v1_2 {
        uint8_t         volume_name[16];
 } PACKED;
 
-#define LARGEST_PAGESIZE                       0x4000
+#define LARGEST_PAGESIZE                       0x10000
 
 int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size)
 {
@@ -48,7 +48,7 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
        unsigned int page;
        struct swap_header_v1_2 *sw;
 
-       info("probing at offset 0x%llx\n", (unsigned long long) off);
+       info("probing at offset 0x%" PRIx64 "\n", off);
 
        /* eek, the swap signature is at the end of the PAGE_SIZE */
        for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
@@ -97,5 +97,7 @@ found_label:
 
 found:
        volume_id_set_usage(id, VOLUME_ID_OTHER);
+       /* we think this is swap, but we make sure no other signatures are found */
+       id->force_unique_result = 1;
        return 0;
 }