#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"
res = umount2 (node, MNT_FORCE);
if (res == -1) {
int errsv = errno;
- perror("umount2");
+ perror(_("umount2"));
errno = errsv;
if (errno == ENOSYS) {
if (verbose)
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);
}
if (res >= 0) {
/* Umount succeeded */
if (verbose)
- printf (_("%s umounted\n"), spec ? spec : node);
+ printf(_("%s umounted\n"), spec ? spec : node);
}
writemtab:
}
/*
- * Returns 1 if everything went well, else 0.
+ * 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.
*/
-int _nfsumount(const char *spec, char *opts)
+static int do_nfs_umount(const char *spec, char *opts)
{
char *hostname;
char *dirname;
struct pmap *pmap = &mnt_server.pmap;
char *p;
- if (spec == NULL || (p = strchr(spec,':')) == NULL)
- goto out_bad;
- hostname = xstrndup(spec, p-spec);
- dirname = xstrdup(p+1);
+ if (spec == NULL) {
+ nfs_error(_("%s: No NFS export name was provided"),
+ progname);
+ return EX_USAGE;
+ }
+
+ p = strchr(spec, ':');
+ if (p == NULL) {
+ nfs_error(_("%s: '%s' is not a legal NFS export name"),
+ progname, spec);
+ return EX_USAGE;
+ }
+ hostname = xstrndup(spec, p - spec);
+ dirname = xstrdup(p + 1);
#ifdef NFS_MOUNT_DEBUG
printf(_("host: %s, directory: %s\n"), hostname, dirname);
#endif
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"),
+ progname, spec);
+ return EX_USAGE;
+ }
+
+ if (!nfs_call_umount(&mnt_server, &dirname)) {
+ nfs_error(_("%s: Server failed to unmount '%s'"),
+ progname, spec);
+ return EX_USAGE;
+ }
- if (!nfs_gethostbyname(hostname, &mnt_server.saddr))
- goto out_bad;
- return nfs_call_umount(&mnt_server, &dirname);
- out_bad:
- nfs_error(_("%s: %s: not found or not mounted"), progname, spec);
return 0;
}
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[])
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;
}
ret = 0;
if (mc) {
if (!lazy)
- _nfsumount(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)
- _nfsumount(spec, "tcp,v3");
+ ret = do_nfs_umount(spec, "tcp,v3");
} else
ret = del_mtab(NULL, spec);