X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Flinux_swap.c;h=1698e9dbf73a0014b382d9bee38077fdc0c1a740;hb=387a8271207b4e921258194cf359039babbc33b9;hp=50d43ccce684dc65c0ca0f7e2f3feea9d4ba224f;hpb=444f07fea49bc40207df5e7910907492529b9bce;p=elogind.git

diff --git a/extras/volume_id/lib/linux_swap.c b/extras/volume_id/lib/linux_swap.c
index 50d43ccce..1698e9dbf 100644
--- a/extras/volume_id/lib/linux_swap.c
+++ b/extras/volume_id/lib/linux_swap.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -24,7 +29,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 struct swap_header_v1_2 {
 	uint8_t		bootbits[1024];
@@ -35,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)
 {
@@ -43,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", (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) {
@@ -73,6 +78,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;
 
@@ -86,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;
 }