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 30a364cedd38e4bc8c31bde2655ca56b5dfb1e12..1fc648f3af0387d1a6e5719baefcba405f39f925 100644 (file)
--- 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;