aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-12-12 07:01:14 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-12-12 07:01:14 +0000
commitd34089b648f3b59fe4746ff99c355c48b2b77d40 (patch)
tree610f542cc4cac57b5eae0747fe0c59748e713155
parent83bf98da2c7af73b696697244f40300644021f2d (diff)
downloadbusybox-w32-d34089b648f3b59fe4746ff99c355c48b2b77d40.tar.gz
busybox-w32-d34089b648f3b59fe4746ff99c355c48b2b77d40.tar.bz2
busybox-w32-d34089b648f3b59fe4746ff99c355c48b2b77d40.zip
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 git-svn-id: svn://busybox.net/trunk/busybox@8082 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--util-linux/mount.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 43856eace..8a1f4a11a 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -284,6 +284,8 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
284 } 284 }
285 } 285 }
286 fclose(f); 286 fclose(f);
287 } else {
288 read_proc = 1;
287 } 289 }
288 290
289 if (read_proc && !status) { 291 if (read_proc && !status) {
@@ -314,8 +316,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
314 fclose(f); 316 fclose(f);
315 } 317 }
316 } else { 318 } else {
317 status = 319 status = do_mount(blockDevice, directory, filesystemType,
318 do_mount(blockDevice, directory, filesystemType,
319 flags | MS_MGC_VAL, string_flags, useMtab, fakeIt, 320 flags | MS_MGC_VAL, string_flags, useMtab, fakeIt,
320 mtab_opts, mount_all); 321 mtab_opts, mount_all);
321 } 322 }