[BusyBox-cvs] svn commit: trunk/busybox: libbb util-linux

[pgf at busybox.net]

Author: pgf
Date: 2005-07-19 14:55:37 -0600 (Tue, 19 Jul 2005)
New Revision: 10863

Log:
applying fix from:
     0000068: mount limited to max 8 loop devices (patch provided)  

(made minor wording change for config help message)


Modified:
   trunk/busybox/libbb/loop.c
   trunk/busybox/util-linux/Config.in


Changeset:
Modified: trunk/busybox/libbb/loop.c
===================================================================
--- trunk/busybox/libbb/loop.c	2005-07-19 20:47:33 UTC (rev 10862)
+++ trunk/busybox/libbb/loop.c	2005-07-19 20:55:37 UTC (rev 10863)
@@ -132,7 +132,7 @@
 	struct stat statbuf;
 	struct loop_info loopinfo;
 
-	for (i = 0; i <= 7; i++) {
+	for (i = 0; i <= CONFIG_FEATURE_MOUNT_LOOP_MAX; i++) {
 		sprintf(dev, LOOP_FORMAT, i);
 		if (stat(dev, &statbuf) == 0 && S_ISBLK(statbuf.st_mode)) {
 			if ((fd = open(dev, O_RDONLY)) >= 0) {

Modified: trunk/busybox/util-linux/Config.in
===================================================================
--- trunk/busybox/util-linux/Config.in	2005-07-19 20:47:33 UTC (rev 10862)
+++ trunk/busybox/util-linux/Config.in	2005-07-19 20:55:37 UTC (rev 10863)
@@ -349,6 +349,14 @@
 	  if you need to do something advanced, such as specify an offset or cryptographic
 	  options to the loopback device.
 
+config CONFIG_FEATURE_MOUNT_LOOP_MAX
+	int "    max number of loop devices"
+	default 7
+	depends on CONFIG_FEATURE_MOUNT_LOOP
+	help
+	  This option sets the highest numbered loop device to be used
+	  automatically by the '-o loop' feature of mount.
+
 config CONFIG_FEATURE_MTAB_SUPPORT
 	bool "  Support for a /etc/mtab file (instead of symlink to /proc/mounts)"
 	default n