From d34089b648f3b59fe4746ff99c355c48b2b77d40 Mon Sep 17 00:00:00 2001
From: andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Fri, 12 Dec 2003 07:01:14 +0000
Subject: 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
---
util-linux/mount.c | 5 +++--
1 file 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,
}
}
fclose(f);
+ } else {
+ read_proc = 1;
}
if (read_proc && !status) {
@@ -314,8 +316,7 @@ static int mount_one(char *blockDevice, char *directory, char *filesystemType,
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);
}
--
cgit v1.2.3-55-g6feb