diff options
| author | Jianhong Yin <yin-jianhong@163.com> | 2016-11-22 14:03:37 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2016-11-22 14:04:31 -0500 |
| commit | 37c07fa0b74a29dea18d359068e9189c5159c49d (patch) | |
| tree | 925731a6cc272c5b96a39b1901dca52a03e748c6 | |
| parent | 126c48afb88245a03bd5e388846d5a68ed4bb2df (diff) | |
| download | nfs-utils-37c07fa0b74a29dea18d359068e9189c5159c49d.tar.gz | |
exportfs: remove redundant exports options output
before this commit, run 'exportfs -s' will output some
options more than one time. for example:
/path *(rw,no_root_squash,rw,secure,no_root_squash,no_all_squash)
the options rw,no_root_squash,etc will be print twice.
the reason is secinfo_show() will show these security options again
this patch remove these redundant outputs.
Signed-off-by: Jianhong Yin <yin-jianhong@163.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | support/nfs/exports.c | 1 | ||||
| -rw-r--r-- | utils/exportfs/exportfs.c | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/support/nfs/exports.c b/support/nfs/exports.c index 0aea6f1..d992747 100644 --- a/support/nfs/exports.c +++ b/support/nfs/exports.c @@ -197,7 +197,6 @@ static const struct secinfo_flag_displaymap { const char *set; const char *unset; } secinfo_flag_displaymap[] = { - { NFSEXP_READONLY, "ro", "rw" }, { NFSEXP_INSECURE_PORT, "insecure", "secure" }, { NFSEXP_ROOTSQUASH, "root_squash", "no_root_squash" }, { NFSEXP_ALLSQUASH, "all_squash", "no_all_squash" }, diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 98368a5..1816796 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -753,20 +753,18 @@ dump(int verbose, int export_format) c = dumpopt(c, "rw"); if (ep->e_flags & NFSEXP_ASYNC) c = dumpopt(c, "async"); + else + c = dumpopt(c, "sync"); if (ep->e_flags & NFSEXP_GATHERED_WRITES) c = dumpopt(c, "wdelay"); + else + c = dumpopt(c, "no_wdelay"); if (ep->e_flags & NFSEXP_NOHIDE) c = dumpopt(c, "nohide"); + else + c = dumpopt(c, "hide"); if (ep->e_flags & NFSEXP_CROSSMOUNT) c = dumpopt(c, "crossmnt"); - if (ep->e_flags & NFSEXP_INSECURE_PORT) - c = dumpopt(c, "insecure"); - if (ep->e_flags & NFSEXP_ROOTSQUASH) - c = dumpopt(c, "root_squash"); - else - c = dumpopt(c, "no_root_squash"); - if (ep->e_flags & NFSEXP_ALLSQUASH) - c = dumpopt(c, "all_squash"); if (ep->e_flags & NFSEXP_NOSUBTREECHECK) c = dumpopt(c, "no_subtree_check"); if (ep->e_flags & NFSEXP_NOAUTHNLM) |