From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Fri, 31 Oct 2003 02:04:18 +0000 (-0000)
Subject: Patch from David Meggy to make the swap default to the new version if no
X-Git-Tag: 1_00_pre4~89
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e64bf409dd07d818d16b48bcee4a285b1dc81f4f;p=oweals%2Fbusybox.git

Patch from David Meggy to make the swap default to the new version if no
version is specified and the kernel is relatively new.
---

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 30a364ced..1fc648f3a 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -320,11 +320,7 @@ int mkswap_main(int argc, char **argv)
 	}
 
 	if (version == -1) {
-		if (PAGES <= V0_MAX_PAGES)
-			version = 0;
-		else if (get_kernel_revision() < MAKE_VERSION(2, 1, 117))
-			version = 0;
-		else if (pagesize < 2048)
+		if (get_kernel_revision() < MAKE_VERSION(2, 1, 117))
 			version = 0;
 		else
 			version = 1;