[PATCH] disk-utils: Let mkswap default to V1 in any case

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Matthias Koenig <mkoenig@xxxxxxx>
---
 disk-utils/mkswap.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 8cafd8f..fdd3e0d 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -617,9 +617,7 @@ main(int argc, char ** argv) {
 			version = 1;
 		else
 		/* use version 1 as default, if possible */
-		if (PAGES <= V0_MAX_PAGES && PAGES > V1_MAX_PAGES)
-			version = 0;
-		else if (linux_version_code() < MAKE_VERSION(2,1,117))
+		if (linux_version_code() < MAKE_VERSION(2,1,117))
 			version = 0;
 		else if (pagesize < 2048)
 			version = 0;
-- 
1.5.0.4.GIT

-
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux