summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorEric Andersen2003-12-12 07:01:14 +0000
committerEric Andersen2003-12-12 07:01:14 +0000
commitc1893c5801b04374917408784688ca9dcfdfe1dc (patch)
tree610f542cc4cac57b5eae0747fe0c59748e713155 /util-linux
parent416c24224dce4abc69708031b74a0e16127af874 (diff)
downloadbusybox-c1893c5801b04374917408784688ca9dcfdfe1dc.zip
busybox-c1893c5801b04374917408784688ca9dcfdfe1dc.tar.gz
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
Diffstat (limited to 'util-linux')
-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 43856ea..8a1f4a1 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);
}