Blame nfs-utils-1.0.9-return-mount-error.patch
|
 |
53f8365 |
--- nfs-utils-1.0.9/utils/mount/mount.c.orig 2006-09-26 11:32:13.000000000 -0400
|
|
|
53f8365 |
+++ nfs-utils-1.0.9/utils/mount/mount.c 2006-09-26 20:23:50.000000000 -0400
|
|
|
53f8365 |
@@ -476,21 +476,24 @@
|
|
|
53f8365 |
}
|
|
|
53f8365 |
}
|
|
|
53f8365 |
|
|
|
53f8365 |
- if (!mnt_err && !fake) {
|
|
|
53f8365 |
- if(!(flags & MS_REMOUNT)) {
|
|
|
53f8365 |
- mnt_err = do_mount_syscall(spec, mount_point,
|
|
|
53f8365 |
- nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
|
|
|
53f8365 |
-
|
|
|
53f8365 |
- if(mnt_err) {
|
|
|
53f8365 |
- mount_error(mount_point);
|
|
|
53f8365 |
- exit(-1);
|
|
|
53f8365 |
- }
|
|
|
53f8365 |
- }
|
|
|
53f8365 |
- if(!nomtab) {
|
|
|
53f8365 |
- add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
|
|
|
53f8365 |
- flags, extra_opts, 0, 0);
|
|
|
53f8365 |
+ if (fake)
|
|
|
53f8365 |
+ return 0;
|
|
|
53f8365 |
+ if (mnt_err)
|
|
|
53f8365 |
+ exit(EX_FAIL);
|
|
|
53f8365 |
+
|
|
|
53f8365 |
+ if(!(flags & MS_REMOUNT)) {
|
|
|
53f8365 |
+ mnt_err = do_mount_syscall(spec, mount_point,
|
|
|
53f8365 |
+ nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
|
|
|
53f8365 |
+
|
|
|
53f8365 |
+ if(mnt_err) {
|
|
|
53f8365 |
+ mount_error(mount_point);
|
|
|
53f8365 |
+ exit(EX_FAIL);
|
|
|
53f8365 |
}
|
|
|
53f8365 |
}
|
|
|
53f8365 |
+ if(!nomtab) {
|
|
|
53f8365 |
+ add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
|
|
|
53f8365 |
+ flags, extra_opts, 0, 0);
|
|
|
53f8365 |
+ }
|
|
|
53f8365 |
|
|
|
53f8365 |
return 0;
|
|
|
53f8365 |
}
|