From: Chuck Lever Date: Fri, 3 Aug 2007 17:23:39 +0000 (-0400) Subject: mount.nfs: umount needs to pick up transport option from /etc/mtab X-Git-Tag: nfs-utils-1-1-1~99 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=59a5507df986d27db7cd38fcd8be5d94eff0fa39;p=nfs-utils.git mount.nfs: umount needs to pick up transport option from /etc/mtab Now that umount's default transport protocol has become more flexible, it will need to detect both proto=udp and proto=tcp in /etc/mtab. Signed-off-by: Chuck Lever Signed-off-by: Neil Brown --- diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c index e8814a3..a78ab26 100644 --- a/utils/mount/nfsumount.c +++ b/utils/mount/nfsumount.c @@ -119,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; @@ -184,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"),