Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location
@ 2020-06-28 19:10 Salvatore Bonaccorso
  2020-06-28 19:10 ` [PATCH 1/2] systemd/Makefile: Drop exlicit setting of unit_dir Salvatore Bonaccorso
  2020-06-28 19:10 ` [PATCH 2/2] systemd generators: Install depending on location for systemd unit files Salvatore Bonaccorso
  0 siblings, 2 replies; 3+ messages in thread
From: Salvatore Bonaccorso @ 2020-06-28 19:10 UTC (permalink / raw)
  To: linux-nfs; +Cc: NeilBrown, Scott Mayhew, Steve Dickson, Salvatore Bonaccorso

Currently --with-systemd=unit-dir-path would be ignored to install the
systemd generators and they are unconditionally installed in
/usr/lib/systemd/system-generators . Distributions installing systemd
unit files in /lib/systemd/system would though install the
systemd-generators in /lib/systemd/system-generators.

Make the installation of the systemd unit generators relative depending
on the unit-dir-path passed for --with-systemd.

Salvatore Bonaccorso (2):
  systemd/Makefile: Drop exlicit setting of unit_dir
  systemd generators: Install depending on location for systemd unit
    files

 systemd/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.27.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/2] systemd/Makefile: Drop exlicit setting of unit_dir
  2020-06-28 19:10 [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
@ 2020-06-28 19:10 ` Salvatore Bonaccorso
  2020-06-28 19:10 ` [PATCH 2/2] systemd generators: Install depending on location for systemd unit files Salvatore Bonaccorso
  1 sibling, 0 replies; 3+ messages in thread
From: Salvatore Bonaccorso @ 2020-06-28 19:10 UTC (permalink / raw)
  To: linux-nfs; +Cc: NeilBrown, Scott Mayhew, Steve Dickson, Salvatore Bonaccorso

The used variable is named unitdir in configure.ac and
systemd/Makefile.am otherwise but is used in a single place as unit_dir.

The setting has no effect, but if later commits would use a base to the
systemd unit files directory for installing further files this would
void the possibility to explicitly set a systemd unit files directory
via configure with --with-systemd=unit-dir-path.

Fixes: 0fbf91a4fd90 ("Include systemd unit files in "dist" and "install".")
Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
---
 systemd/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 75cdd9f54c81..f089c8831902 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -45,7 +45,6 @@ man5_MANS	= nfs.conf.man
 man7_MANS	= nfs.systemd.man
 EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)
 
-unit_dir = /usr/lib/systemd/system
 generator_dir = /usr/lib/systemd/system-generators
 
 EXTRA_PROGRAMS	= nfs-server-generator rpc-pipefs-generator
-- 
2.27.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] systemd generators: Install depending on location for systemd unit files
  2020-06-28 19:10 [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
  2020-06-28 19:10 ` [PATCH 1/2] systemd/Makefile: Drop exlicit setting of unit_dir Salvatore Bonaccorso
@ 2020-06-28 19:10 ` Salvatore Bonaccorso
  1 sibling, 0 replies; 3+ messages in thread
From: Salvatore Bonaccorso @ 2020-06-28 19:10 UTC (permalink / raw)
  To: linux-nfs; +Cc: NeilBrown, Scott Mayhew, Steve Dickson, Salvatore Bonaccorso

While it is possible to configure the systemd unit files directory on
configure time with --with-systemd=unit-dir-path, this path is not taken
into account for installing the systemd unit generators, as they are
installed unconditionally in /usr/lib/systemd/system-generators.

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
---
 systemd/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index f089c8831902..9ee4f1c8f967 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -45,7 +45,7 @@ man5_MANS	= nfs.conf.man
 man7_MANS	= nfs.systemd.man
 EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)
 
-generator_dir = /usr/lib/systemd/system-generators
+generator_dir = $(unitdir)/../system-generators
 
 EXTRA_PROGRAMS	= nfs-server-generator rpc-pipefs-generator
 genexecdir = $(generator_dir)
-- 
2.27.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-28 19:10 [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
2020-06-28 19:10 ` [PATCH 1/2] systemd/Makefile: Drop exlicit setting of unit_dir Salvatore Bonaccorso
2020-06-28 19:10 ` [PATCH 2/2] systemd generators: Install depending on location for systemd unit files Salvatore Bonaccorso

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org
	public-inbox-index linux-nfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git