From: Sami Kerola <kerolasa@iki.fi>
Date: Fri, 25 Apr 2014 23:40:28 +0000 (+0100)
Subject: swapon: swaps with legacy version label are not supported
X-Git-Tag: v2.25-rc1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb397d19e447e723ea293ecdcd4441fa8fe017f2;p=thirdparty%2Futil-linux.git

swapon: swaps with legacy version label are not supported

Reviewed-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 6c422ce41e..b88b7ec63a 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -344,8 +344,7 @@ err:
 
 static int swap_detect_signature(const char *buf, int *sig)
 {
-	if (memcmp(buf, "SWAP-SPACE", 10) == 0 ||
-            memcmp(buf, "SWAPSPACE2", 10) == 0)
+	if (memcmp(buf, SWAP_SIGNATURE, SWAP_SIGNATURE_SZ) == 0)
 		*sig = SIG_SWAPSPACE;
 
 	else if (memcmp(buf, "S1SUSPEND", 9) == 0 ||