summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2007-03-20 11:13:42 +1100
committerNeil Brown <neilb@suse.de>2007-03-20 11:13:42 +1100
commit390e67de5d9fe919d1894359536f0c5527fa2331 (patch)
tree34f3657f5b807b9c1d6a303fcd814ee6cb9487c9 /utils
parent3482b1145c2c9a39f1dcaabc32e36eb234b91447 (diff)
downloadnfs-utils-390e67de5d9fe919d1894359536f0c5527fa2331.tar.gz
nfs-utils-390e67de5d9fe919d1894359536f0c5527fa2331.tar.xz
nfs-utils-390e67de5d9fe919d1894359536f0c5527fa2331.zip
Handle -o remount better
On -o remount, we need to update the entry in mtab rather than add a new one. update_mtab does this so use that. However it might free some strings that shouldn't be freed, so stop it from calling free - the program will exit soon anyway so no exit is needed.
Diffstat (limited to 'utils')
-rw-r--r--utils/mount/mount.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 55d60aa..4da9002 100644
--- 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) {