From patchwork Fri Dec 28 03:30:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 10744137 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 8406713AD for ; Fri, 28 Dec 2018 03:42:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74F3C28C94 for ; Fri, 28 Dec 2018 03:42:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 648BE28C99; Fri, 28 Dec 2018 03:42:58 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0FBD428C94 for ; Fri, 28 Dec 2018 03:42:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 03C41211A1E53; Thu, 27 Dec 2018 19:42:58 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=dan.j.williams@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 99B6621198CC2 for ; Thu, 27 Dec 2018 19:42:56 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Dec 2018 19:42:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,407,1539673200"; d="scan'208";a="112540061" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga008.fm.intel.com with ESMTP; 27 Dec 2018 19:42:55 -0800 Subject: [ndctl PATCH 4/7] ndctl/monitor: Unify definition of default monitor configfile path From: Dan Williams To: linux-nvdimm@lists.01.org Date: Thu, 27 Dec 2018 19:30:19 -0800 Message-ID: <154596781985.164521.10399375562523595499.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <154596779833.164521.12632457592535372923.stgit@dwillia2-desk3.amr.corp.intel.com> References: <154596779833.164521.12632457592535372923.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.18-2-gc94f MIME-Version: 1.0 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The definition of the monitor configuration file can get out of sync with current duplication between configure.ac and ndctl/Makefile.am. Instead, define all the variables in configure.ac and just reference them in ndctl/Makefile.am. Cc: QI Fuli Signed-off-by: Dan Williams --- configure.ac | 8 +++++++- ndctl/Makefile.am | 6 ++---- ndctl/monitor.c | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index de5b84cec670..aa07ec7bc870 100644 --- a/configure.ac +++ b/configure.ac @@ -154,8 +154,14 @@ fi AC_SUBST([systemd_unitdir]) AM_CONDITIONAL([ENABLE_SYSTEMD_UNITS], [test "x$with_systemd" = "xyes"]) +ndctl_monitorconfdir=${sysconfdir}/ndctl +ndctl_monitorconf=monitor.conf +AC_SUBST([ndctl_monitorconfdir]) +AC_SUBST([ndctl_monitorconf]) +AC_DEFINE_UNQUOTED(NDCTL_CONF_FILE, ["$ndctl_monitorconfdir/$ndctl_monitorconf"], + [default ndctl monitor conf path]) + my_CFLAGS="\ --D DEF_CONF_FILE='\"${sysconfdir}/ndctl/monitor.conf\"' \ -Wall \ -Wchar-subscripts \ -Wformat-security \ diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am index 8a5e5f87e6c5..ff01e0688afd 100644 --- a/ndctl/Makefile.am +++ b/ndctl/Makefile.am @@ -43,10 +43,8 @@ ndctl_SOURCES += ../test/libndctl.c \ test.c endif -monitor_config_file = monitor.conf -monitor_configdir = $(sysconfdir)/ndctl/ -monitor_config_DATA = $(monitor_config_file) -EXTRA_DIST += $(monitor_config_file) +monitor_configdir = $(ndctl_monitorconfdir) +monitor_config_DATA = $(ndctl_monitorconf) if ENABLE_SYSTEMD_UNITS systemd_unit_DATA = ndctl-monitor.service diff --git a/ndctl/monitor.c b/ndctl/monitor.c index 08219f99b12b..cef70d06beae 100644 --- a/ndctl/monitor.c +++ b/ndctl/monitor.c @@ -503,7 +503,7 @@ static int read_config_file(struct ndctl_ctx *ctx, struct monitor *_monitor, if (_monitor->config_file) config_file = strdup(_monitor->config_file); else - config_file = strdup(DEF_CONF_FILE); + config_file = strdup(NDCTL_CONF_FILE); if (!config_file) { fail("strdup default config file failed\n"); rc = -ENOMEM;