"mount" now reports errors from nfsmount() and assumes NFS mount

if ':' is present in the device name - Pavel Roskin


git-svn-id: svn://busybox.net/trunk/busybox@615 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 7 insertions, 4 deletions

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,