From 93ba60f01d19f443187d8720fd8a93bdb890d4e5 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Wed, 28 Feb 2001 15:33:12 +0000 Subject: [PATCH] Keep trying if an NFS mount fails, and eliminate a call to exit(3). --- mount.c | 9 ++++----- util-linux/mount.c | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mount.c b/mount.c index 551695b9b..76cab7d79 100644 --- 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 551695b9b..76cab7d79 100644 --- 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;