From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 16 Feb 2014 23:54:19 +0000 (+0000)
Subject: swaplabel: wrong version number in check
X-Git-Tag: v2.25-rc1~589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fce72f96d0911a7578e27430e11b857bb1b0aecf;p=thirdparty%2Futil-linux.git

swaplabel: wrong version number in check

$ swaplabel /dev/sda2
swaplabel: /dev/sda2: unsupported swap version '1'

The mkswap does not allow any other version, so swaplabel(8) must be
wrong.

Reference: https://github.com/karelzak/util-linux/blob/master/disk-utils/mkswap.c#L520
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c
index a5ccb7ec38..5d048aabbe 100644
--- a/disk-utils/swaplabel.c
+++ b/disk-utils/swaplabel.c
@@ -70,7 +70,7 @@ static blkid_probe get_swap_prober(const char *devname)
 		/* supported is SWAPSPACE2 only */
 		if (blkid_probe_lookup_value(pr, "VERSION", &version, NULL) == 0
 		    && version
-		    && strcmp(version, "2"))
+		    && strcmp(version, "1"))
 			warnx(_("%s: unsupported swap version '%s'"),
 						devname, version);
 		else