From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 230C72097FAAE for ; Fri, 13 Jul 2018 13:36:59 -0700 (PDT) From: "Verma, Vishal L" Subject: Re: [ndctl PATCH v12 3/5] ndctl, monitor: add the unit file of systemd for ndctl-monitor service Date: Fri, 13 Jul 2018 20:36:42 +0000 Message-ID: <1531514201.7574.147.camel@intel.com> References: <20180713155403.30020-1-qi.fuli@jp.fujitsu.com> <20180713155403.30020-4-qi.fuli@jp.fujitsu.com> <1531508737.7574.141.camel@intel.com> In-Reply-To: <1531508737.7574.141.camel@intel.com> Content-Language: en-US Content-ID: <4837254218665047932F5B5BFE7A8C2F@intel.com> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: "linux-nvdimm@lists.01.org" , "qi.fuli@jp.fujitsu.com" , "msys.mizuma@gmail.com" Cc: "tokunaga.keiich@jp.fujitsu.com" List-ID: On Fri, 2018-07-13 at 19:05 +0000, Verma, Vishal L wrote: > On Fri, 2018-07-13 at 14:24 -0400, Masayoshi Mizuma wrote: > > Hi Qi, > > > > On 07/13/2018 11:54 AM, QI Fuli wrote: > > > This patch adds the systemd unit file for ndctl-monitor service. > > > The systemd unit directory can be configured by setting > > > environment > > > variable "--with-systemd-unit-dir[=DIR]". > > > > > > A monitor daemon can be started as a system service: > > > # systemctl start ndctl-monitor.service > > > > > > Signed-off-by: QI Fuli > > > --- > > > autogen.sh | 3 ++- > > > configure.ac | 22 ++++++++++++++++++++++ > > > ndctl.spec.in | 1 + > > > ndctl/Makefile.am | 4 ++++ > > > ndctl/ndctl-monitor.service | 7 +++++++ > > > 5 files changed, 36 insertions(+), 1 deletion(-) > > > create mode 100644 ndctl/ndctl-monitor.service > > > > > > diff --git a/autogen.sh b/autogen.sh > > > index 2a52688..21b0e25 100755 > > > --- a/autogen.sh > > > +++ b/autogen.sh > > > @@ -17,7 +17,8 @@ libdir() { > > > > > > args="--prefix=/usr \ > > > --sysconfdir=/etc \ > > > ---libdir=$(libdir /usr/lib)" > > > +--libdir=$(libdir /usr/lib) \ > > > +--with-systemd-unit-dir" > > > > > > echo > > > echo "---------------------------------------------------------- > > > ------" > > > diff --git a/configure.ac b/configure.ac > > > index cf44260..a5ba9a1 100644 > > > --- a/configure.ac > > > +++ b/configure.ac > > > @@ -143,6 +143,27 @@ AC_CHECK_FUNCS([ \ > > > secure_getenv\ > > > ]) > > > > > > +PKG_PROG_PKG_CONFIG > > > +AC_ARG_WITH([systemd-unit-dir], > > > + AS_HELP_STRING([--with-systemd-unit-dir[=DIR]], > > > + [Directory for systemd service files]), > > > + [], > > > + [with_systemd_unit_dir=yes]) > > > + > > > +if test "x$with_systemd_unit_dir" = "xyes"; then > > > + def_systemd_unit_dir=$($PKG_CONFIG -- > > > variable=systemdsystemunitdir systemd) > > > + if test "x$def_systemd_unit_dir" = "x"; then > > > + AC_MSG_ERROR([systemd support requested but pkg- > > > config unable to query systemd package]) > > > + with_systemd_unit_dir=no > > > + else > > > + with_systemd_unit_dir="$def_systemd_unit_dir" > > > + fi > > > +fi > > > + > > > +AS_IF([test "x$with_systemd_unit_dir" != "xno"], > > > + [AC_SUBST([systemd_unitdir], [$with_systemd_unit_dir])]) > > > +AM_CONDITIONAL([ENABLE_SYSTEMD_UNIT_DIR], [test > > > "x$with_systemd_unit_dir" != "xno"]) > > > + > > > my_CFLAGS="\ > > > -Wall \ > > > -Wchar-subscripts \ > > > @@ -184,6 +205,7 @@ AC_MSG_RESULT([ > > > sysconfdir: ${sysconfdir} > > > libdir: ${libdir} > > > includedir: ${includedir} > > > + systemd-unit-dir: ${systemd_unitdir} > > > > not tab, white space is good here. > > > > > > > > compiler: ${CC} > > > cflags: ${CFLAGS} > > > diff --git a/ndctl.spec.in b/ndctl.spec.in > > > index 42760fa..6f7d299 100644 > > > --- a/ndctl.spec.in > > > +++ b/ndctl.spec.in > > > @@ -142,6 +142,7 @@ make check > > > %{_libdir}/libndctl.so > > > %{_libdir}/pkgconfig/libndctl.pc > > > %{_sysconfdir}/ndctl/monitor.conf > > > +%{_unitdir}/ndctl-monitor.service > > > > The monitor conf and service should be included in ndctl package, > > so, > > why don't you add such as the following ? > > > > %files > > %defattr(-,root,root) > > %license util/COPYING licenses/BSD-MIT licenses/CC0 > > %{_bindir}/ndctl > > %{_mandir}/man1/ndctl* > > %{bashcompdir}/ > > %{_sysconfdir}/ndctl/monitor.conf > > %{_unitdir}/ndctl-monitor.service > > > > Yes these files need to be in the %files section, and not in the > %files -n DNAME section (which is for the ndctl-devel package). Also according to this: https://fedoraproject.org/wiki/Packaging:Systemd#Filesystem_locations We'll need to add: BuildRequires: systemd > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm