diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | mount.c | 11 | ||||
| -rw-r--r-- | util-linux/mount.c | 11 |
3 files changed, 16 insertions, 8 deletions
@@ -57,6 +57,8 @@ * Implemented "rm -- <foo>" * "which" rewritten to use stat(). Fixes to improve its compatability with traditional implementations -- Pavel Roskin. + * "mount" now reports errors from nfsmount() and assumes NFS mount + if ':' is present in the device name - Pavel Roskin * More doc updates @@ -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, diff --git a/util-linux/mount.c b/util-linux/mount.c index bde55d155..ee6c9475a 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, |