From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 14 Feb 2011 02:52:16 +0000 (+0100)
Subject: reverted LINHIB0001 swap signature addition
X-Git-Tag: 1_19_0~293
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=48a5219f39a7fcb8b9670d20439a3ab89c2b9bac;p=oweals%2Fbusybox.git

reverted LINHIB0001 swap signature addition

see:

https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/683605

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 62d588522..1ee534ab0 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -55,7 +55,6 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/)
 			if (memcmp(buf, "SWAPSPACE2", 10) == 0
 			 || memcmp(buf, "S1SUSPEND", 9) == 0
 			 || memcmp(buf, "S2SUSPEND", 9) == 0
-			 || memcmp(buf, "LINHIB0001", 10) == 0
 			 || memcmp(buf, "ULSUSPEND", 9) == 0
 			) {
 				sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));