From: Chuck Lever <chuck.lever@oracle.com>
Date: Sat, 28 Jul 2007 21:49:28 +0000 (-0400)
Subject: umount.nfs: some umount.nfs error return codes are confusing
X-Git-Tag: nfs-utils-1-1-1~129
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=d98b797653f1a021c4d157c8dd09d2b732e522da;hp=a574c7558e33f172b6dfee53ee8df9e59c84c7b5

umount.nfs: some umount.nfs error return codes are confusing

umount.nfs should return the standard EX_ mount return codes.  At some
point in the past, it was returning 0 for failure and 1 for success, and
some of these have been changed and some haven't.  See if we can rectify
this.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index aa68dee..ae2b2d2 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -281,17 +281,17 @@ int nfsumount(int argc, char *argv[])
 		case 'h':
 		default:
 			umount_usage();
-			return 0;
+			return EX_USAGE;
 		}
 	}
 	if (optind != argc) {
 		umount_usage();
-		return 0;
+		return EX_USAGE;
 	}
 	
 	if (spec == NULL || (*spec != '/' && strchr(spec,':') == NULL)) {
-		printf(_("umount: %s: not found\n"), spec);
-		return 0;
+		nfs_error(_("%s: %s: not found\n"), progname, spec);
+		return EX_USAGE;
 	}
 
 	if (*spec == '/')
@@ -319,7 +319,7 @@ int nfsumount(int argc, char *argv[])
 		only_root:
 			nfs_error(_("%s: You are not permitted to unmount %s"),
 					progname, spec);
-			return 0;
+			return EX_USAGE;
 		}
 		if (hasmntopt(&mc->m, "users") == NULL) {
 			char *opt = hasmntopt(&mc->m, "user");