mount.nfs: teach [u]mount.nfs[4] to exit with EX_SUCCESS instead of 0

[nfs-utils.git] / utils / mount / nfsumount.c

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index fd4194faf6d196e1e572e53beeadf29a50dec718..ca9c801bab6f48abd0e7a3d5a9a2a0de058d0a4b 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -29,11 +29,9 @@
 #include "xcommon.h"
 #include "fstab.h"
 #include "nls.h"
-#include "conn.h"
 
 #include "mount_constants.h"
 #include "mount.h"
-#include "nfsumount.h"
 #include "error.h"
 #include "network.h"
 
@@ -69,7 +67,7 @@ static int del_mtab(const char *spec, const char *node)
                 res = umount2 (node, MNT_FORCE);
                 if (res == -1) {
                         int errsv = errno;
-                        perror("umount2");
+                        perror(_("umount2"));
                         errno = errsv;
                         if (errno == ENOSYS) {
                                 if (verbose)
@@ -95,7 +93,7 @@ static int del_mtab(const char *spec, const char *node)
                                 update_mtab(node, &remnt);
                         return 0;
                 } else if (errno != EBUSY) {    /* hmm ... */
-                        perror("remount");
+                        perror(_("remount"));
                         nfs_error(_("%s: could not remount %s read-only"),
                                        progname, spec);
                 }
@@ -104,7 +102,7 @@ static int del_mtab(const char *spec, const char *node)
         if (res >= 0) {
                 /* Umount succeeded */
                 if (verbose)
-                        printf (_("%s umounted\n"), spec ? spec : node);
+                        printf(_("%s umounted\n"), spec ? spec : node);
         }
 
  writemtab:
@@ -121,6 +119,16 @@ static int del_mtab(const char *spec, const char *node)
         return EX_FILEIO;
 }
 
+/*
+ * Pick up certain mount options used during the original mount
+ * from /etc/mtab.  The basics include the server's IP address and
+ * the server pathname of the share to unregister.
+ *
+ * These options might also describe the mount port, mount protocol
+ * version, and transport protocol used to punch through a firewall.
+ * We will need this information to get through the firewall again
+ * to do the umount.
+ */
 static int do_nfs_umount(const char *spec, char *opts)
 {
        char *hostname;
@@ -186,6 +194,8 @@ static int do_nfs_umount(const char *spec, char *opts)
                pmap->pm_vers = atoi(p+10);
        if (opts && (hasmntopt(&mnt, "udp") || hasmntopt(&mnt, "proto=udp")))
                pmap->pm_prot = IPPROTO_UDP;
+       if (opts && (hasmntopt(&mnt, "tcp") || hasmntopt(&mnt, "proto=tcp")))
+               pmap->pm_prot = IPPROTO_TCP;
 
        if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) {
                nfs_error(_("%s: '%s' does not contain a recognized hostname"),
@@ -199,7 +209,7 @@ static int do_nfs_umount(const char *spec, char *opts)
                return EX_USAGE;
        }
 
-       return 0;
+       return EX_SUCCESS;
 }
 
 static struct option umount_longopts[] =
@@ -214,13 +224,13 @@ static struct option umount_longopts[] =
 
 static void umount_usage(void)
 {
-       printf("usage: %s dir [-fvnrlh]\n", progname);
-       printf("options:\n\t-f\t\tforce unmount\n");
-       printf("\t-v\t\tverbose\n");
-       printf("\t-n\t\tDo not update /etc/mtab\n");
-       printf("\t-r\t\tremount\n");
-       printf("\t-l\t\tlazy unmount\n");
-       printf("\t-h\t\tprint this help\n\n");
+       printf(_("usage: %s dir [-fvnrlh]\n"), progname);
+       printf(_("options:\n\t-f\t\tforce unmount\n"));
+       printf(_("\t-v\tverbose\n"));
+       printf(_("\t-n\tDo not update /etc/mtab\n"));
+       printf(_("\t-r\tremount\n"));
+       printf(_("\t-l\tlazy unmount\n"));
+       printf(_("\t-h\tprint this help\n\n"));
 }
 
 int nfsumount(int argc, char *argv[])
@@ -284,7 +294,7 @@ int nfsumount(int argc, char *argv[])
 
        if (mc && strcmp(mc->m.mnt_type, "nfs") != 0 &&
            strcmp(mc->m.mnt_type, "nfs4") != 0) {
-               nfs_error(_("%s: %s on %s it not an nfs filesystem"),
+               nfs_error(_("%s: %s on %s is not an NFS filesystem"),
                                progname, mc->m.mnt_fsname, mc->m.mnt_dir);
                return EX_USAGE;
        }
@@ -295,7 +305,7 @@ int nfsumount(int argc, char *argv[])
                        /* umount might call us twice.  The second time there will
                         * be no entry in mtab and we should just exit quietly
                         */
-                       return 0;
+                       return EX_SUCCESS;
 
                only_root:
                        nfs_error(_("%s: You are not permitted to unmount %s"),
@@ -326,11 +336,12 @@ int nfsumount(int argc, char *argv[])
        ret = 0;
        if (mc) {
                if (!lazy)
-                       do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
-               ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+                       ret = do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
+               if (!ret || force)
+                       ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
        } else if (*spec != '/') {
                if (!lazy)
-                       do_nfs_umount(spec, "tcp,v3");
+                       ret = do_nfs_umount(spec, "tcp,v3");
        } else
                ret = del_mtab(NULL, spec);