From patchwork Tue Nov 6 18:36:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 10671271 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90799175A for ; Tue, 6 Nov 2018 18:36:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8409129006 for ; Tue, 6 Nov 2018 18:36:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77C252AAF1; Tue, 6 Nov 2018 18:36:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DF8229006 for ; Tue, 6 Nov 2018 18:36:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388315AbeKGEC7 (ORCPT ); Tue, 6 Nov 2018 23:02:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35340 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388697AbeKGECy (ORCPT ); Tue, 6 Nov 2018 23:02:54 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D3E0307DAA1; Tue, 6 Nov 2018 18:36:21 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-119.rdu2.redhat.com [10.10.123.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD8EC5C21B; Tue, 6 Nov 2018 18:36:20 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 3B1F22293C; Tue, 6 Nov 2018 13:36:20 -0500 (EST) From: Scott Mayhew To: steved@redhat.com Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org Subject: [nfs-utils PATCH RFC 6/7] nfsdcld: add /etc/nfs.conf support Date: Tue, 6 Nov 2018 13:36:19 -0500 Message-Id: <20181106183620.18609-7-smayhew@redhat.com> In-Reply-To: <20181106183620.18609-1-smayhew@redhat.com> References: <20181106183620.18609-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 06 Nov 2018 18:36:21 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Scott Mayhew --- nfs.conf | 4 ++++ utils/nfsdcld/nfsdcld.c | 13 +++++++++++++ utils/nfsdcld/nfsdcld.man | 15 +++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/nfs.conf b/nfs.conf index 0d0ec9b..2157b9c 100644 --- a/nfs.conf +++ b/nfs.conf @@ -33,6 +33,10 @@ # state-directory-path=/var/lib/nfs # ha-callout= # +#[nfsdcld] +# debug=0 +# storagedir=/var/lib/nfs/nfsdcld +# #[nfsdcltrack] # debug=0 # storagedir=/var/lib/nfs/nfsdcltrack diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c index 272c7c5..313c68f 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 b607ba6..c271d14 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