| Message ID | 154752453130.1624444.5980546681656304647.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fed9cf8d98dd407106633dbddd717fb5d5db2e4c |
| Headers | show |
| Series | [ndctl] ndctl, rpm: Mark monitor.conf as a configuration file | expand |
On Mon, 2019-01-14 at 19:55 -0800, Dan Williams wrote: > In case a user has made local modifications to > /etc/ndctl/monitor.conf, > instrument the spec file to not clobber those changes. > > Cc: Qi Fuli <qi.fuli@jp.fujitsu.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > ndctl.spec.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Thanks, applied.
diff --git a/ndctl.spec.in b/ndctl.spec.in index 26396d4abad7..bc4d65c1f988 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -117,9 +117,10 @@ make check %{_bindir}/ndctl %{_mandir}/man1/ndctl* %{bashcompdir}/ -%{_sysconfdir}/ndctl/monitor.conf %{_unitdir}/ndctl-monitor.service +%config(noreplace) %{_sysconfdir}/ndctl/monitor.conf + %files -n daxctl %defattr(-,root,root) %license util/COPYING licenses/BSD-MIT licenses/CC0
In case a user has made local modifications to /etc/ndctl/monitor.conf, instrument the spec file to not clobber those changes. Cc: Qi Fuli <qi.fuli@jp.fujitsu.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- ndctl.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)