diff options
author | Scott Mayhew <smayhew@redhat.com> | 2019-04-16 11:49:59 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2019-04-16 14:22:08 -0400 |
commit | 86df1f069fd35a86730eb65f1cda0d854ac9981b (patch) | |
tree | 91fd1ba3e1e5b82ff7a88edcea12409194c864c9 /utils | |
parent | a8ce6c346193f2c89012da7bea34d7b59b38c035 (diff) | |
download | nfs-utils-86df1f069fd35a86730eb65f1cda0d854ac9981b.tar.gz |
nfsdcld: add /etc/nfs.conf support
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils')
-rw-r--r-- | utils/nfsdcld/nfsdcld.c | 13 | ||||
-rw-r--r-- | utils/nfsdcld/nfsdcld.man | 15 |
2 files changed, 28 insertions, 0 deletions
diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c index 272c7c58..313c68ff 100644 --- a/utils/nfsdcld/nfsdcld.c +++ b/utils/nfsdcld/nfsdcld.c @@ -45,6 +45,7 @@ #include "cld-internal.h" #include "sqlite.h" #include "../mount/version.h" +#include "conffile.h" #ifndef DEFAULT_PIPEFS_DIR #define DEFAULT_PIPEFS_DIR NFS_STATEDIR "/rpc_pipefs" @@ -640,6 +641,7 @@ main(int argc, char **argv) char *progname; char *storagedir = CLD_DEFAULT_STORAGEDIR; struct cld_client clnt; + char *s; memset(&clnt, 0, sizeof(clnt)); @@ -653,6 +655,17 @@ main(int argc, char **argv) xlog_syslog(0); xlog_stderr(1); + conf_init_file(NFS_CONFFILE); + s = conf_get_str("general", "pipefs-directory"); + if (s) + strlcpy(pipefs_dir, s, sizeof(pipefs_dir)); + s = conf_get_str("nfsdcld", "storagedir"); + if (s) + storagedir = s; + rc = conf_get_num("nfsdcld", "debug", 0); + if (rc > 0) + xlog_config(D_ALL, 1); + /* process command-line options */ while ((arg = getopt_long(argc, argv, "hdFp:s:", longopts, NULL)) != EOF) { diff --git a/utils/nfsdcld/nfsdcld.man b/utils/nfsdcld/nfsdcld.man index b607ba64..c271d141 100644 --- a/utils/nfsdcld/nfsdcld.man +++ b/utils/nfsdcld/nfsdcld.man @@ -163,6 +163,21 @@ Location of the rpc_pipefs filesystem. The default value is .IX Item "-s storagedir, --storagedir=storage_dir" Directory where stable storage information should be kept. The default value is \fI/var/lib/nfs/nfsdcld\fR. +.SH "CONFIGURATION FILE" +.IX Header "CONFIGURATION FILE" +The following values are recognized in the \fB[nfsdcld]\fR section +of the \fI/etc/nfs.conf\fR configuration file: +.IP "\fBstoragedir\fR" 4 +.IX Item "storagedir" +Equivalent to \fB\-s\fR/\fB\-\-storagedir\fR. +.IP "\fBdebug\fR" 4 +.IX Item "debug" +Setting "debug = 1" is equivalent to \fB\-d\fR/\fB\-\-debug\fR. +.LP +In addition, the following value is recognized from the \fB[general]\fR section: +.IP "\fBpipefs\-directory\fR" 4 +.IX Item "pipefs-directory" +Equivalent to \fB\-p\fR/\fB\-\-pipefsdir\fR. .SH "NOTES" .IX Header "NOTES" The Linux kernel NFSv4 server has historically tracked this information |