aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dickson <steved@redhat.com>2021-01-06 13:12:12 -0500
committerSteve Dickson <steved@redhat.com>2021-01-07 10:57:05 -0500
commit8142542bda28401802b4537d24dce21d3555440e (patch)
treec244c0582d597382d1cb98b8c8b2d7ba55c00aed
parentcb5f167cf9c2af94d9928c1ee3aa72c8e5c812f4 (diff)
downloadnfs-utils-8142542bda28401802b4537d24dce21d3555440e.tar.gz
mount: parse default values correctly
Commit 88c22f92 converted the configfile.c routines to use the parse_opt interfaces which broke how default values from nfsmount.conf are managed. Default values can not be added to the mount string handed to the kernel. They must be interpreted into the correct mount options then passed to the kernel. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1912877 Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/mount/configfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
index 7934f4f6..e865998d 100644
--- a/utils/mount/configfile.c
+++ b/utils/mount/configfile.c
@@ -277,8 +277,10 @@ conf_parse_mntopts(char *section, char *arg, struct mount_options *options)
}
if (buf[0] == '\0')
continue;
+ if (default_value(buf))
+ continue;
+
po_append(options, buf);
- default_value(buf);
}
conf_free_list(list);
}