[nfs-utils PATCH 0/3] A few small nfsdcld fixes

[nfs-utils PATCH 0/3] A few small nfsdcld fixes

[Scott Mayhew]

The first two patches fix problems I noticed when trying to build an rpm
package w/ nfsdcld enabled.  The third patch fixes an issue I found
trying to use nfsdcld on a ppc64le system.

Scott Mayhew (3):
  nfsdcld: don't override sbindir
  systemd: install nfsdcld.service when nfsdcld is enabled
  nfsdcld: getopt_long() returns an int, not a char

 systemd/Makefile.am       | 5 +++++
 utils/nfsdcld/Makefile.am | 4 ----
 utils/nfsdcld/nfsdcld.c   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.17.2

[nfs-utils PATCH 1/3] nfsdcld: don't override sbindir

[Scott Mayhew]

According to the guidelines in hier(7), nfsdcld should live in /usr/sbin
and not /sbin.  Plus, the nfsdcld.service systemd unit file is looking
for it in /usr/sbin.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 utils/nfsdcld/Makefile.am | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/utils/nfsdcld/Makefile.am b/utils/nfsdcld/Makefile.am
index 2c4e5a1..273d64f 100644
--- a/utils/nfsdcld/Makefile.am
+++ b/utils/nfsdcld/Makefile.am
@@ -1,9 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-# These binaries go in /sbin (not /usr/sbin), and that cannot be
-# overridden at config time. The kernel "knows" the /sbin name.
-sbindir = /sbin
-
 man8_MANS	= nfsdcld.man
 EXTRA_DIST	= $(man8_MANS)
 
-- 
2.17.2

[nfs-utils PATCH 2/3] systemd: install nfsdcld.service when nfsdcld is enabled

[Scott Mayhew]

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 systemd/Makefile.am | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 590258a..75cdd9f 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -36,6 +36,11 @@ unit_files += \
 endif
 endif
 
+if CONFIG_NFSDCLD
+unit_files += \
+    nfsdcld.service
+endif
+
 man5_MANS	= nfs.conf.man
 man7_MANS	= nfs.systemd.man
 EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)
-- 
2.17.2

[nfs-utils PATCH 3/3] nfsdcld: getopt_long() returns an int, not a char

[Scott Mayhew]

This was causing nfsdcld to spit out a usage message instead of starting
up on non-x86_64 arches.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
---
 utils/nfsdcld/nfsdcld.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c
index 9297df5..2ad1001 100644
--- a/utils/nfsdcld/nfsdcld.c
+++ b/utils/nfsdcld/nfsdcld.c
@@ -737,7 +737,7 @@ out:
 int
 main(int argc, char **argv)
 {
-	char arg;
+	int arg;
 	int rc = 0;
 	bool foreground = false;
 	char *progname;
-- 
2.17.2

Re: [nfs-utils PATCH 0/3] A few small nfsdcld fixes

[Steve Dickson]

On 11/26/19 10:47 AM, Scott Mayhew wrote:
> The first two patches fix problems I noticed when trying to build an rpm
> package w/ nfsdcld enabled.  The third patch fixes an issue I found
> trying to use nfsdcld on a ppc64le system.
> 
> Scott Mayhew (3):
>   nfsdcld: don't override sbindir
>   systemd: install nfsdcld.service when nfsdcld is enabled
>   nfsdcld: getopt_long() returns an int, not a char
> 
>  systemd/Makefile.am       | 5 +++++
>  utils/nfsdcld/Makefile.am | 4 ----
>  utils/nfsdcld/nfsdcld.c   | 2 +-
>  3 files changed, 6 insertions(+), 5 deletions(-)
> 
Series committed... (tag:  nfs-utils-2-4-3-rc3)

steved.