linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / 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
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ 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] 6+ 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
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ 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 related	[flat|nested] 6+ 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
  2021-09-06 18:50 ` [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
  2021-09-23 16:33 ` Steve Dickson
  3 siblings, 0 replies; 6+ 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 related	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location
  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
@ 2021-09-06 18:50 ` Salvatore Bonaccorso
  2021-09-20 16:50   ` Steve Dickson
  2021-09-23 16:33 ` Steve Dickson
  3 siblings, 1 reply; 6+ messages in thread
From: Salvatore Bonaccorso @ 2021-09-06 18:50 UTC (permalink / raw)
  To: linux-nfs; +Cc: NeilBrown, Scott Mayhew, Steve Dickson

Hi,

On Sun, Jun 28, 2020 at 09:10:00PM +0200, Salvatore Bonaccorso wrote:
> 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(-)

is this something we could have applied or is there something wrong
with the patches which I should fix first?

Regards,
Salvatore

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

* Re: [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location
  2021-09-06 18:50 ` [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
@ 2021-09-20 16:50   ` Steve Dickson
  0 siblings, 0 replies; 6+ messages in thread
From: Steve Dickson @ 2021-09-20 16:50 UTC (permalink / raw)
  To: Salvatore Bonaccorso, linux-nfs; +Cc: NeilBrown, Scott Mayhew

Hey!

On 9/6/21 2:50 PM, Salvatore Bonaccorso wrote:
> Hi,
> 
> On Sun, Jun 28, 2020 at 09:10:00PM +0200, Salvatore Bonaccorso wrote:
>> 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(-)
> 
> is this something we could have applied or is there something wrong
> with the patches which I should fix first?
Sorry for the delay... I took a lot of PTO this summer...

Looking at it now...

steved.
> 
> Regards,
> Salvatore
> 


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

* Re: [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location
  2020-06-28 19:10 [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
                   ` (2 preceding siblings ...)
  2021-09-06 18:50 ` [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
@ 2021-09-23 16:33 ` Steve Dickson
  3 siblings, 0 replies; 6+ messages in thread
From: Steve Dickson @ 2021-09-23 16:33 UTC (permalink / raw)
  To: Salvatore Bonaccorso, linux-nfs; +Cc: NeilBrown, Scott Mayhew



On 6/28/20 3:10 PM, Salvatore Bonaccorso wrote:
> 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(-)
> 
Committed... (tag: nfs-utils-2-5-5-rc3)

In the future, If have not responded in a month please
feel free to ping me... because mostly likely it has
fell off my radar... my apologies for taking so long...

steved.


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

end of thread, other threads:[~2021-09-23 16:33 UTC | newest]

Thread overview: 6+ 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
2021-09-06 18:50 ` [PATCH 0/2] Allow to to install systemd generators dependend on --with-systemd unit-dir-path location Salvatore Bonaccorso
2021-09-20 16:50   ` Steve Dickson
2021-09-23 16:33 ` Steve Dickson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).