Handle -o remount better

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

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index cdccfe894778a957245242c1657c87629c4659b9..4da900240e249eda79c54de0291ea42c11c5d1ab 100644 (file)
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -179,6 +179,11 @@ int add_mtab(char *fsname, char *mount_point, char *fstype, int flags, char *opt
        ment.mnt_freq = 0;
        ment.mnt_passno= 0;
 
+       if(flags & MS_REMOUNT) {
+               update_mtab(ment.mnt_dir, &ment);
+               return 0;
+       }
+
        lock_mtab();
 
         if ((mtab = setmntent(MOUNTED, "a+")) == NULL) {
@@ -274,16 +279,16 @@ static void mount_error(char *node)
 {
        switch(errno) {
                case ENOTDIR:
-                       printf("%s: mount point %s is not a directory\n", progname, node);
+                       fprintf(stderr, "%s: mount point %s is not a directory\n", progname, node);
                        break;
                case EBUSY:
-                       printf("%s: %s is already mounted or busy\n", progname, node);
+                       fprintf(stderr, "%s: %s is already mounted or busy\n", progname, node);
                        break;
                case ENOENT:
-                       printf("%s: mount point %s does not exist\n", progname, node);
+                       fprintf(stderr, "%s: mount point %s does not exist\n", progname, node);
                        break;
                default:
-                       printf("%s: %s\n", progname, strerror(errno));
+                       fprintf(stderr, "%s: %s\n", progname, strerror(errno));
        }
 }
 
@@ -443,18 +448,18 @@ int main(int argc, char *argv[])
                        start_statd();
        }
 
-       if (fake)
-               return 0;
        if (mnt_err)
                exit(EX_FAIL);
 
-       mnt_err = do_mount_syscall(spec, mount_point,
-                                  nfs_mount_vers == 4 ? "nfs4" : "nfs",
-                                  flags, mount_opts);
-               
-       if (mnt_err) {
-               mount_error(mount_point);
-               exit(EX_FAIL);
+       if (!fake) {
+               mnt_err = do_mount_syscall(spec, mount_point,
+                                          nfs_mount_vers == 4 ? "nfs4" : "nfs",
+                                          flags, mount_opts);
+
+               if (mnt_err) {
+                       mount_error(mount_point);
+                       exit(EX_FAIL);
+               }
        }
 
        if (!nomtab)