Attachment 291469 Details for Bug 253530 – Update NFS failed mount error message

[patch] Update NFS failed mount error message

nfs-utils-1.1.0-mount-v4-errors-updated.patch (text/plain), 1.97 KB, created by Christopher Brown on 2008-01-12 16:33:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Brown

Created: 2008-01-12 16:33:51 UTC

Size: 1.97 KB

patch

obsolete

>--- nfs-utils-1.1.0/utils/mount/mount.c.orig	2007-05-11 04:40:57.000000000 +0100
>+++ nfs-utils-1.1.0/utils/mount/mount.c	2008-01-11 19:56:33.000000000 +0000
>@@ -285,17 +285,28 @@
> 	}
> }
> 
>-static void mount_error(char *node)
>+static void mount_error(char *mount_point, char *node)
> {
> 	switch(errno) {
> 		case ENOTDIR:
>-			fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
>+			fprintf(stderr, "%s: mount point %s is not a directory\n", 
>+				progname, mount_point);
> 			break;
> 		case EBUSY:
>-			fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
>-			break;
>+		        fprintf(stderr,
>+				"%s: %s is already mounted"
>+				"with different options.\n"
>+				"  Check and change mount options "
>+				"or add nosharecache.\n",
>+				progname, mount_point);
>+		        break;
> 		case ENOENT:
>-			fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
>+			if (node) 
>+				fprintf(stderr, "%s: %s failed, reason given by server: %s\n",
>+					progname, node, strerror(errno));
>+			else
>+				fprintf(stderr, "%s: mount point %s does not exist\n", progname, 
>+					mount_point);
> 			break;
> 		default:
> 			fprintf(stderr, "%s: %s\n", progname, strerror(errno));
>@@ -351,6 +362,26 @@
> #endif
> 	return 0;
> }
>+static int chk_mountpoint(char *mount_point)
>+{
>+	struct stat sb;
>+
>+	if (stat(mount_point, &sb) < 0){
>+		mount_error(mount_point, NULL);
>+		return 1;
>+	}
>+	if (S_ISDIR(sb.st_mode) == 0){
>+		errno = ENOTDIR;
>+		mount_error(mount_point, NULL);
>+		return 1;
>+	}
>+	if (access(mount_point, X_OK) < 0) {
>+		mount_error(mount_point, NULL);
>+		return 1;
>+	}
>+
>+	return 0;
>+}
> 
> int main(int argc, char *argv[])
> {
>@@ -508,6 +539,9 @@
> 	    }
> 	}
> 
>+	if (chk_mountpoint(mount_point))
>+		exit(1);
>+
> 	if (nfs_mount_vers == 4)
> 		mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
> 	else {
>@@ -538,7 +572,7 @@
> 					   mount_opts);
> 
> 		if (mnt_err) {
>-			mount_error(mount_point);
>+			mount_error(mount_point, spec);
> 			exit(EX_FAIL);
> 		}
> 	}

Actions: View | Diff

Attachments on bug 253530: 291468 | 291469