X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_swap.c;h=592a38570d46d4852fcf4b4c93f4430676054723;hp=8aca564d7276b8efdccb5f7b40d4accd788593ba;hb=be9c76b4345b36ec40d8b7b22dc687b4042fe56f;hpb=708cb3594139f28f7d99b4ea1cf91b4ccd032273;ds=sidebyside

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 8aca564d7..592a38570 100644
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -43,7 +43,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", (unsigned long long) off);
+	info("probing at offset 0x%llx\n", (unsigned long long) off);
 
 	/* eek, the swap signature is at the end of the PAGE_SIZE */
 	for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) {
@@ -73,6 +73,12 @@ int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off, uint64_t size
 				strcpy(id->type_version, "ulsuspend");
 				goto found_label;
 			}
+
+			if (memcmp(buf, "\xed\xc3\x02\xe9\x98\x56\xe5\x0c", 8) == 0) {
+				id->type = "suspend";
+				strcpy(id->type_version, "tuxonice");
+				goto found_label;
+			}
 	}
 	return -1;
 
@@ -81,7 +87,7 @@ found_label:
 	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);
+		volume_id_set_uuid(id, sw->uuid, 0, UUID_DCE);
 	}
 
 found: