mount.nfs: When -v is set and the mount succeeds, print the mount info

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 96b56973faeeb3731dcd98d74a51d216c5378fcf..dde4562b045d9f60e4e571ea8a35cf1e914a7ac7 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -42,6 +42,7 @@
 #include "nfsumount.h"
 #include "mount.h"
 #include "error.h"
+#include "network.h"
 
 char *progname;
 int nfs_mount_data_version;
@@ -71,11 +72,6 @@ struct opt_map {
   int  mask;                    /* flag mask value */
 };
 
-/* Custom mount options for our own purposes.  */
-#define MS_DUMMY       0x00000000
-#define MS_USERS       0x40000000
-#define MS_USER                0x80000000
-
 static const struct opt_map opt_map[] = {
   { "defaults", 0, 0, 0         },      /* default options */
   { "ro",       1, 0, MS_RDONLY },      /* read-only */
@@ -175,6 +171,18 @@ static void discover_nfs_mount_data_version(void)
                nfs_mount_data_version = NFS_MOUNT_VERSION;
 }
 
+static void print_one(char *spec, char *node, char *type, char *opts)
+{
+       if (verbose) {
+               printf("%s on %s type %s", spec, node, type);
+
+               if (opts != NULL)
+                       printf(" (%s)", opts);
+
+               printf("\n");
+       }
+}
+
 /* Try to build a canonical options string.  */
 static char * fix_opts_string (int flags, const char *extra_opts) {
        const struct opt_map *om;
@@ -254,11 +262,6 @@ fail_unlock:
        return result;
 }
 
-int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data)
-{
-       return mount(spec, node, type, flags, data);
-}
-
 void mount_usage()
 {
        printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n",
@@ -350,56 +353,6 @@ static int chk_mountpoint(char *mount_point)
        return 0;
 }
 
-extern u_short getport(
-       struct sockaddr_in *saddr,
-       u_long prog,
-       u_long vers,
-       u_int prot);
-
-static int probe_statd()
-{
-       struct sockaddr_in addr;
-       u_short port;
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-       port = getport(&addr, 100024, 1, IPPROTO_UDP);
-
-       if (port == 0)
-               return 0;
-       addr.sin_port = htons(port);
-
-       if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0)
-               return 0;
-
-       return 1;
-}
-
-static int start_statd()
-{
-       /* If /var/run/rpc.statd.pid exists and is non-empty,
-        * assume statd already running.
-        * If START_STATD not defined, or defined to a non-existent file,
-        * don't bother,
-        * else run that file (typically a shell script)
-        */
-       struct stat stb;
-
-       if (probe_statd())
-               return 1;
-#ifdef START_STATD
-       if (stat(START_STATD, &stb) ==0 &&
-           S_ISREG(stb.st_mode) &&
-           (stb.st_mode & S_IXUSR)) {
-               system(START_STATD);
-               if (probe_statd())
-                       return 1;
-       }
-#endif
-       return 0;
-}
-
 int main(int argc, char *argv[])
 {
        int c, flags = 0, mnt_err = 1, fake = 0;
@@ -527,38 +480,15 @@ int main(int argc, char *argv[])
                exit(EX_FAIL);
 
        if (strcmp(fs_type, "nfs4") == 0)
-               mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0);
-       else {
-               int need_statd = 0;
-               mnt_err = nfsmount(spec, mount_point, &flags,
-                                  &extra_opts, &mount_opts,
-                                  0, &need_statd);
-               if (!mnt_err && !fake && need_statd) {
-                       if (!start_statd()) {
-                               fprintf(stderr,
-                                       "%s: rpc.statd is not running but is "
-                                       "required for remote locking\n"
-                                       "   Either use \"-o nolocks\" to keep "
-                                       "locks local, or start statd.\n",
-                                       progname);
-                               exit(1);
-                       }
-               }
-       }
+               mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake);
+       else
+               mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake);
 
        if (mnt_err)
                exit(EX_FAIL);
 
-       if (!fake) {
-               mnt_err = do_mount_syscall(spec, mount_point, fs_type,
-                                          flags & ~(MS_USER|MS_USERS) ,
-                                          mount_opts);
-
-               if (mnt_err) {
-                       mount_error(spec, mount_point, errno);
-                       exit(EX_FAIL);
-               }
-       }
+       if (!fake)
+               print_one(spec, mount_point, fs_type, mount_opts);
 
        if (!nomtab)
                mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts,