Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.busybox.net/busybox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2003-10-31 05:04:18 +0300
committerGlenn L McGrath <bug1@ihug.co.nz>2003-10-31 05:04:18 +0300
commite64bf409dd07d818d16b48bcee4a285b1dc81f4f (patch)
treef5527bcd3c27f7d42798909773d6fdb5cea0a50c /util-linux
parent4ef5a84583488942142d1adf9bdc46cb44ba0626 (diff)
Patch from David Meggy to make the swap default to the new version if no
version is specified and the kernel is relatively new.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mkswap.c6
1 files changed, 1 insertions, 5 deletions
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;