|
 |
cafae3a |
--- nfs-utils-1.1.0/utils/mount/mount.c.orig 2007-07-18 16:26:01.000000000 -0400
|
|
|
cafae3a |
+++ nfs-utils-1.1.0/utils/mount/mount.c 2007-07-18 16:37:34.000000000 -0400
|
|
|
cafae3a |
@@ -286,17 +286,24 @@ static void parse_opts (const char *opti
|
|
|
cafae3a |
}
|
|
|
2d06576 |
}
|
|
|
2d06576 |
|
|
|
2d06576 |
-static void mount_error(char *node)
|
|
|
cafae3a |
+static void mount_error(char *mount_point, char *node)
|
|
|
2d06576 |
{
|
|
|
2d06576 |
switch(errno) {
|
|
|
2d06576 |
case ENOTDIR:
|
|
|
2d06576 |
- fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
|
|
|
2d06576 |
+ fprintf(stderr, "%s: mount point %s is not a directory\n",
|
|
|
cafae3a |
+ progname, mount_point);
|
|
|
2d06576 |
break;
|
|
|
2d06576 |
case EBUSY:
|
|
|
2d06576 |
- fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
|
|
|
cafae3a |
+ fprintf(stderr, "%s: %s is already mounted or busy\n", progname,
|
|
|
cafae3a |
+ mount_point);
|
|
|
2d06576 |
break;
|
|
|
2d06576 |
case ENOENT:
|
|
|
2d06576 |
- fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
|
|
|
cafae3a |
+ if (node)
|
|
|
2d06576 |
+ fprintf(stderr, "%s: %s failed, reason given by server: %s\n",
|
|
|
2d06576 |
+ progname, node, strerror(errno));
|
|
|
cafae3a |
+ else
|
|
|
cafae3a |
+ fprintf(stderr, "%s: mount point %s does not exist\n", progname,
|
|
|
cafae3a |
+ mount_point);
|
|
|
2d06576 |
break;
|
|
|
2d06576 |
default:
|
|
|
2d06576 |
fprintf(stderr, "%s: %s\n", progname, strerror(errno));
|
|
|
cafae3a |
@@ -352,6 +359,26 @@ static int start_statd()
|
|
|
cafae3a |
#endif
|
|
|
cafae3a |
return 0;
|
|
|
2d06576 |
}
|
|
|
f543a22 |
+static int chk_mountpoint(char *mount_point)
|
|
|
2d06576 |
+{
|
|
|
2d06576 |
+ struct stat sb;
|
|
|
2d06576 |
+
|
|
|
2d06576 |
+ if (stat(mount_point, &sb) < 0){
|
|
|
2d06576 |
+ mount_error(mount_point, NULL);
|
|
|
2d06576 |
+ return 1;
|
|
|
2d06576 |
+ }
|
|
|
2d06576 |
+ if (S_ISDIR(sb.st_mode) == 0){
|
|
|
2d06576 |
+ errno = ENOTDIR;
|
|
|
2d06576 |
+ mount_error(mount_point, NULL);
|
|
|
2d06576 |
+ return 1;
|
|
|
2d06576 |
+ }
|
|
|
2d06576 |
+ if (access(mount_point, X_OK) < 0) {
|
|
|
2d06576 |
+ mount_error(mount_point, NULL);
|
|
|
2d06576 |
+ return 1;
|
|
|
2d06576 |
+ }
|
|
|
2d06576 |
+
|
|
|
2d06576 |
+ return 0;
|
|
|
2d06576 |
+}
|
|
|
2d06576 |
|
|
|
2d06576 |
int main(int argc, char *argv[])
|
|
|
cafae3a |
{
|
|
|
cafae3a |
@@ -509,6 +536,9 @@ int main(int argc, char *argv[])
|
|
|
cafae3a |
}
|
|
|
2d06576 |
}
|
|
|
2d06576 |
|
|
|
2d06576 |
+ if (chk_mountpoint(mount_point))
|
|
|
cafae3a |
+ exit(1);
|
|
|
2d06576 |
+
|
|
|
cafae3a |
if (nfs_mount_vers == 4)
|
|
|
cafae3a |
mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
|
|
|
cafae3a |
else {
|
|
|
cafae3a |
@@ -539,7 +569,7 @@ int main(int argc, char *argv[])
|
|
|
cafae3a |
mount_opts);
|
|
|
2d06576 |
|
|
|
2d06576 |
if (mnt_err) {
|
|
|
2d06576 |
- mount_error(mount_point);
|
|
|
2d06576 |
+ mount_error(mount_point, spec);
|
|
|
2d06576 |
exit(EX_FAIL);
|
|
|
2d06576 |
}
|
|
|
2d06576 |
}
|