summaryrefslogtreecommitdiff
path: root/util-linux/mount.c
diff options
context:
space:
mode:
authorPavel Roskin2000-06-06 17:03:55 +0000
committerPavel Roskin2000-06-06 17:03:55 +0000
commit680d65a646feaea3c3440ca81732c3c09ae95d15 (patch)
treef1d28e9822c2df07e37ac314f0c86ab9ea7e6995 /util-linux/mount.c
parent68480dc30f9cdf4a660ea773353d2c9f56eb61d8 (diff)
downloadbusybox-680d65a646feaea3c3440ca81732c3c09ae95d15.zip
busybox-680d65a646feaea3c3440ca81732c3c09ae95d15.tar.gz
"mount" now reports errors from nfsmount() and assumes NFS mount
if ':' is present in the device name - Pavel Roskin
Diffstat (limited to 'util-linux/mount.c')
-rw-r--r--util-linux/mount.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index bde55d1..ee6c947 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -483,11 +483,14 @@ extern int mount_main(int argc, char **argv)
} else {
if (device && directory) {
#ifdef BB_NFSMOUNT
+ if (strchr(device, ':') != NULL)
+ filesystemType = "nfs";
if (strcmp(filesystemType, "nfs") == 0) {
- if (nfsmount
- (device, directory, &flags, &extra_opts, &string_flags,
- 1) != 0)
- exit(FALSE);
+ int ret;
+ ret = nfsmount (device, directory, &flags,
+ &extra_opts, &string_flags, 1);
+ if (ret != 0)
+ fatalError("nfsmount failed: %s\n", strerror(errno));
}
#endif
exit(mount_one(device, directory, filesystemType,