[BusyBox-cvs] busybox/util-linux mount.c,1.114,1.115

[Erik Andersen]

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

Modified Files:
	mount.c 
Log Message:
Doh!  I broke automatic filesystem type guessing.  Fix mount so
it will properly fall back to /proc/mounts when /etc/filesystems
is missing, allowing mount to guess the correct fs type when a
fs type is not explicitly specified.
 -Erik


Index: mount.c
===================================================================
RCS file: /var/cvs/busybox/util-linux/mount.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- mount.c	9 Dec 2003 23:50:24 -0000	1.114
+++ mount.c	12 Dec 2003 07:01:14 -0000	1.115
@@ -284,6 +284,8 @@
 				}
 			}
 			fclose(f);
+		} else {
+			read_proc = 1;
 		}
 
 		if (read_proc && !status) {
@@ -314,8 +316,7 @@
 			fclose(f);
 		}
 	} else {
-		status =
-			do_mount(blockDevice, directory, filesystemType,
+		status = do_mount(blockDevice, directory, filesystemType,
 					 flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
 					 mtab_opts, mount_all);
 	}