[BusyBox-cvs] busybox/util-linux mkswap.c,1.28,1.29

Glenn McGrath bug1 at busybox.net
Fri Oct 31 02:04:22 UTC 2003


Update of /var/cvs/busybox/util-linux
In directory winder:/tmp/cvs-serv26021/util-linux

Modified Files:
	mkswap.c 
Log Message:
Patch from David Meggy to make the swap default to the new version if no 
version is specified and the kernel is relatively new.


Index: mkswap.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/mkswap.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mkswap.c	14 Jul 2003 21:21:07 -0000	1.28
+++ mkswap.c	31 Oct 2003 02:04:18 -0000	1.29
@@ -320,11 +320,7 @@
 	}
 
 	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;




More information about the busybox-cvs mailing list