From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH 2/2] spec, make: Add discovery.conf to the package files list
Date: Wed, 24 Apr 2019 14:49:42 -0700 [thread overview]
Message-ID: <20190424214942.11288-2-sagi@grimberg.me> (raw)
In-Reply-To: <20190424214942.11288-1-sagi@grimberg.me>
Lets add it as part of the package with a little documentation.
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
Makefile | 3 +++
etc/discovery.conf.in | 4 ++++
nvme.spec.in | 1 +
3 files changed, 8 insertions(+)
create mode 100644 etc/discovery.conf.in
diff --git a/Makefile b/Makefile
index 02299c45734f..4bfbebbd156a 100644
--- a/Makefile
+++ b/Makefile
@@ -102,6 +102,9 @@ install-etc:
$(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/nvme
touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn
touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostid
+ if [ ! -f $(DESTDIR)$(SBINDIR)/nvme/discovery.conf ]; then \
+ $(INSTALL) -m 644 -T ./etc/discovery.conf.in $(DESTDIR)$(SYSCONFDIR)/nvme/discovery.conf; \
+ fi
install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc
install: install-spec install-hostparams
diff --git a/etc/discovery.conf.in b/etc/discovery.conf.in
new file mode 100644
index 000000000000..14e0d9c3dcbf
--- /dev/null
+++ b/etc/discovery.conf.in
@@ -0,0 +1,4 @@
+# Used for extracting default parameters for discovery
+#
+# Example:
+# --transport=<trtype> --traddr=<traddr> --trsvcid=<trsvcid> --host-traddr=<host-traddr>
diff --git a/nvme.spec.in b/nvme.spec.in
index 147b64a530f8..6934f8fd605b 100644
--- a/nvme.spec.in
+++ b/nvme.spec.in
@@ -34,6 +34,7 @@ make install-spec DESTDIR=%{buildroot} PREFIX=/usr
%dir %{_sysconfdir}/nvme
%{_sysconfdir}/nvme/hostnqn
%{_sysconfdir}/nvme/hostid
+%{_sysconfdir}/nvme/discovery.conf
%clean
rm -rf $RPM_BUILD_ROOT
--
2.17.1
next prev parent reply other threads:[~2019-04-24 21:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-24 21:49 [PATCH 1/2] spec, Makefile: add /etc/nvme files to package files Sagi Grimberg
2019-04-24 21:49 ` Sagi Grimberg [this message]
2019-04-25 1:15 ` [PATCH 2/2] spec, make: Add discovery.conf to the package files list Minwoo Im
2019-04-25 14:59 ` [PATCH 1/2] spec, Makefile: add /etc/nvme files to package files Keith Busch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190424214942.11288-2-sagi@grimberg.me \
--to=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox