X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsumount.c;h=eb3d1fb5ae714da80ec01c026d085f3672fbb067;hp=077219d6ae87e223669492c642e55bfc9d481b5e;hb=a64b65aac7af65f96a24cd89fc07a31dbb5980ab;hpb=1e42be20a3283994d0ffd6c5f80c36fab5a887a8

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 077219d..eb3d1fb 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -147,7 +147,7 @@ int del_mtab(const char *spec, const char *node)
                 res = mount(spec, node, NULL,
                             MS_MGC_VAL | MS_REMOUNT | MS_RDONLY, NULL);
                 if (res == 0) {
-                        nfs_mntent_t remnt;
+                        struct mntent remnt;
                         fprintf(stderr,
                                 _("umount: %s busy - remounted read-only\n"),
                                 spec);
@@ -324,16 +324,17 @@ int nfsumount(int argc, char *argv[])
 	if (!mc && verbose)
 		printf(_("Could not find %s in mtab\n"), spec);
 
+	ret = 0;
 	if (mc) {
-		ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+		if (!lazy)
+			ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
 		if(ret)
 			ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
-	} else {
-		if (*spec != '/')
+	} else if (*spec != '/') {
+		if (!lazy)
 			ret = _nfsumount(spec, "tcp,v3");
-		else
-			ret = del_mtab(NULL, spec);
-	}
+	} else
+		ret = del_mtab(NULL, spec);
 
 	return(ret);
 }