Get rid of the "-i" option for mount.nfs[4] and always use the text-

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 627019afa2b1974bd75c501261ade8d578e86522..6ae6b79962c73fbbd7a852e661a6c8e9eeeb3ebe 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -64,7 +64,6 @@ static struct option longopts[] = {
   { "version", 0, 0, 'V' },
   { "read-write", 0, 0, 'w' },
   { "rw", 0, 0, 'w' },
-  { "string", 0, 0, 'i' },
   { "options", 1, 0, 'o' },
   { NULL, 0, 0, 0 }
 };
@@ -176,6 +175,9 @@ static void discover_nfs_mount_data_version(void)
        }
        if (nfs_mount_data_version > NFS_MOUNT_VERSION)
                nfs_mount_data_version = NFS_MOUNT_VERSION;
+       else
+               if (kernel_version > MAKE_VERSION(2, 6, 22))
+                       string++;
 }
 
 static void print_one(char *spec, char *node, char *type, char *opts)
@@ -237,7 +239,8 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
 
        if (flags & MS_REMOUNT) {
                update_mtab(ment.mnt_dir, &ment);
-               return 0;
+               free(ment.mnt_opts);
+               return EX_SUCCESS;
        }
 
        lock_mtab();
@@ -261,12 +264,13 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
                goto fail_close;
        }
 
-       result = 0;
+       result = EX_SUCCESS;
 
 fail_close:
        endmntent(mtab);
 fail_unlock:
        unlock_mtab();
+       free(ment.mnt_opts);
 
        return result;
 }
@@ -283,7 +287,6 @@ void mount_usage(void)
        printf(_("\t-f\t\tFake mount, do not actually mount\n"));
        printf(_("\t-n\t\tDo not update /etc/mtab\n"));
        printf(_("\t-s\t\tTolerate sloppy mount options rather than fail\n"));
-       printf(_("\t-i\t\tPass mount options to the kernel via a string\n"));
        printf(_("\t-h\t\tPrint this help\n"));
        printf(_("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"));
 }
@@ -374,14 +377,10 @@ static int try_mount(char *spec, char *mount_point, int flags,
 {
        int ret;
 
-       if (string) {
-               if (strcmp(fs_type, "nfs4") == 0)
-                       ret = nfs4mount_s(spec, mount_point, flags,
-                                               extra_opts, fake, bg);
-               else
-                       ret = nfsmount_s(spec, mount_point, flags,
-                                               extra_opts, fake, bg);
-       } else {
+       if (string)
+               ret = nfsmount_string(spec, mount_point, fs_type, flags,
+                                       extra_opts, fake, bg);
+       else {
                if (strcmp(fs_type, "nfs4") == 0)
                        ret = nfs4mount(spec, mount_point, flags,
                                        extra_opts, fake, bg);
@@ -421,7 +420,7 @@ int main(int argc, char *argv[])
                        printf("%s ("PACKAGE_STRING")\n", progname);
                else
                        mount_usage();
-               exit(0);
+               exit(EX_SUCCESS);
        }
 
        if ((argc < 3)) {
@@ -433,7 +432,7 @@ int main(int argc, char *argv[])
        mount_point = argv[2];
 
        argv[2] = argv[0]; /* so that getopt error messages are correct */
-       while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hsi",
+       while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs",
                                longopts, NULL)) != -1) {
                switch (c) {
                case 'r':
@@ -444,7 +443,7 @@ int main(int argc, char *argv[])
                        break;
                case 'V':
                        printf("%s: ("PACKAGE_STRING")\n", progname);
-                       exit(0);
+                       exit(EX_SUCCESS);
                case 'w':
                        flags &= ~MS_RDONLY;
                        break;
@@ -463,19 +462,10 @@ int main(int argc, char *argv[])
                case 's':
                        ++sloppy;
                        break;
-               case 'i':
-                       if (linux_version_code() < MAKE_VERSION(2, 6, 23)) {
-                               nfs_error(_("%s: Passing mount options via a"
-                                       " string is unsupported by this"
-                                       " kernel\n"), progname);
-                               exit(EX_USAGE);
-                       }
-                       ++string;
-                       break;
                case 'h':
                default:
                        mount_usage();
-                       exit(EX_USAGE);
+                       goto out_usage;
                }
        }
 
@@ -484,7 +474,7 @@ int main(int argc, char *argv[])
         */
        if (optind != argc - 2) {
                mount_usage();
-               exit(EX_USAGE);
+               goto out_usage;
        }
 
        if (strcmp(progname, "mount.nfs4") == 0)
@@ -503,7 +493,7 @@ int main(int argc, char *argv[])
                    strcmp(mc->m.mnt_type, fs_type) != 0) {
                        nfs_error(_("%s: permission denied: no match for %s "
                                "found in /etc/fstab"), progname, mount_point);
-                       exit(EX_USAGE);
+                       goto out_usage;
                }
 
                /*
@@ -518,7 +508,7 @@ int main(int argc, char *argv[])
        mount_point = canonicalize(mount_point);
        if (!mount_point) {
                nfs_error(_("%s: no mount point provided"), progname);
-               exit(EX_USAGE);
+               goto out_usage;
        }
        if (mount_point[0] != '/') {
                nfs_error(_("%s: unrecognized mount point %s"),
@@ -545,15 +535,19 @@ int main(int argc, char *argv[])
        mnt_err = try_mount(spec, mount_point, flags, fs_type, &extra_opts,
                                mount_opts, fake, nomtab, FOREGROUND);
        if (mnt_err == EX_BG) {
-               printf(_("mount: backgrounding \"%s\"\n"), spec);
+               printf(_("%s: backgrounding \"%s\"\n"),
+                       progname, spec);
                fflush(stdout);
 
                /*
-                * Parent exits immediately with success.  Make
-                * sure not to free "mount_point"
+                * Parent exits immediately with success.
                 */
-               if (fork() > 0)
-                       exit(0);
+               if (daemon(0, 0)) {
+                       nfs_error(_("%s: failed to start "
+                                       "background process: %s\n"),
+                                               progname, strerror(errno));
+                       exit(EX_FAIL);
+               }
 
                mnt_err = try_mount(spec, mount_point, flags, fs_type,
                                        &extra_opts, mount_opts, fake,
@@ -561,10 +555,15 @@ int main(int argc, char *argv[])
                if (verbose && mnt_err)
                        printf(_("%s: giving up \"%s\"\n"),
                                progname, spec);
-               exit(0);
        }
 
 out:
+       free(mount_opts);
+       free(extra_opts);
        free(mount_point);
        exit(mnt_err);
+
+out_usage:
+       free(mount_opts);
+       exit(EX_USAGE);
 }