Keep trying if an NFS mount fails, and eliminate a call to exit(3).

diff --git a/mount.c b/mount.c
index 551695b9b6f5bda444cef441cbd0cb808469559e..76cab7d79535b37eda297d6560aaec49ca36d2f2 100644 (file)
--- a/mount.c
+++ b/mount.c
@@ -479,10 +479,9 @@ singlemount:
                        if (strchr(device, ':') != NULL)
                                filesystemType = "nfs";
                        if (strcmp(filesystemType, "nfs") == 0) {
-                               rc = nfsmount (device, directory, &flags,
-                                       &extra_opts, &string_flags, 1);
-                               if ( rc != 0) {
-                                       perror_msg_and_die("nfsmount failed");  
+                               if (nfsmount (device, directory, &flags, &extra_opts,
+                                                       &string_flags, 1)) {
+                                       perror_msg("nfsmount failed");
                                        rc = EXIT_FAILURE;
                                }
                        }
@@ -500,7 +499,7 @@ singlemount:
                if (all == FALSE && fstabmount == TRUE && directory == NULL)
                        fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
        
-               exit(rc);
+               return rc;
        }
        
        goto singlemount;

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 551695b9b6f5bda444cef441cbd0cb808469559e..76cab7d79535b37eda297d6560aaec49ca36d2f2 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -479,10 +479,9 @@ singlemount:
                        if (strchr(device, ':') != NULL)
                                filesystemType = "nfs";
                        if (strcmp(filesystemType, "nfs") == 0) {
-                               rc = nfsmount (device, directory, &flags,
-                                       &extra_opts, &string_flags, 1);
-                               if ( rc != 0) {
-                                       perror_msg_and_die("nfsmount failed");  
+                               if (nfsmount (device, directory, &flags, &extra_opts,
+                                                       &string_flags, 1)) {
+                                       perror_msg("nfsmount failed");
                                        rc = EXIT_FAILURE;
                                }
                        }
@@ -500,7 +499,7 @@ singlemount:
                if (all == FALSE && fstabmount == TRUE && directory == NULL)
                        fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
        
-               exit(rc);
+               return rc;
        }
        
        goto singlemount;