|
 |
8280d7e |
--- nfs-utils-1.0.9/utils/mount/nfsumount.c.orig 2006-07-28 11:12:32.000000000 -0400
|
|
|
8280d7e |
+++ nfs-utils-1.0.9/utils/mount/nfsumount.c 2006-07-28 11:14:41.000000000 -0400
|
|
|
8280d7e |
@@ -100,9 +100,9 @@ int nfs_call_umount(clnt_addr_t *mnt_ser
|
|
|
8280d7e |
}
|
|
|
8280d7e |
mnt_closeclnt(clnt, msock);
|
|
|
8280d7e |
if (res == RPC_SUCCESS)
|
|
|
8280d7e |
- return 1;
|
|
|
8280d7e |
+ return 0;
|
|
|
8280d7e |
out_bad:
|
|
|
8280d7e |
- return 0;
|
|
|
8280d7e |
+ return 1;
|
|
|
8280d7e |
}
|
|
|
8280d7e |
|
|
|
8280d7e |
u_int get_mntproto(const char *);
|
|
|
8280d7e |
@@ -251,9 +251,6 @@ int add_mtab2(const char *spec, const ch
|
|
|
8280d7e |
return 1;
|
|
|
8280d7e |
}
|
|
|
8280d7e |
|
|
|
8280d7e |
-/*
|
|
|
8280d7e |
- * Returns 1 if everything went well, else 0.
|
|
|
8280d7e |
- */
|
|
|
8280d7e |
int _nfsumount(const char *spec, const char *opts)
|
|
|
8280d7e |
{
|
|
|
8280d7e |
char *hostname;
|
|
|
8280d7e |
@@ -309,8 +306,8 @@ int _nfsumount(const char *spec, const c
|
|
|
8280d7e |
goto out_bad;
|
|
|
8280d7e |
return nfs_call_umount(&mnt_server, &dirname);
|
|
|
8280d7e |
out_bad:
|
|
|
8280d7e |
- fprintf(stderr, "%s: %s: not found or not mounted\n", progname, spec);
|
|
|
8280d7e |
- return 0;
|
|
|
8280d7e |
+ fprintf(stderr, "%s: %s: not found / mounted or server not reachable\n", progname, spec);
|
|
|
8280d7e |
+ return 1;
|
|
|
8280d7e |
}
|
|
|
8280d7e |
|
|
|
8280d7e |
static struct option umount_longopts[] =
|
|
|
8280d7e |
@@ -393,14 +390,18 @@ int nfsumount(int argc, char *argv[])
|
|
|
8280d7e |
}
|
|
|
8280d7e |
}
|
|
|
8280d7e |
|
|
|
8280d7e |
- ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
|
|
|
8280d7e |
- if(ret)
|
|
|
8280d7e |
+ ret = 0;
|
|
|
8280d7e |
+ if(!force && !lazy)
|
|
|
8280d7e |
+ ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
|
|
|
8280d7e |
+ if(!ret)
|
|
|
8280d7e |
ret = add_mtab2(mc->m.mnt_fsname, mc->m.mnt_dir,
|
|
|
8280d7e |
mc->m.mnt_type, mc->m.mnt_opts, mc);
|
|
|
8280d7e |
}
|
|
|
8280d7e |
else {
|
|
|
8280d7e |
- ret = _nfsumount(spec, NULL);
|
|
|
8280d7e |
- if(ret)
|
|
|
8280d7e |
+ ret = 0;
|
|
|
8280d7e |
+ if(!force && !lazy)
|
|
|
8280d7e |
+ ret = _nfsumount(spec, NULL);
|
|
|
8280d7e |
+ if(!ret)
|
|
|
8280d7e |
ret = add_mtab2(spec, spec, spec, spec, NULL);
|
|
|
8280d7e |
}
|
|
|
8280d7e |
|