diff --git a/.gitignore b/.gitignore

index 126d12c..941aca0 100644

--- a/.gitignore

+++ b/.gitignore

@@ -70,6 +70,7 @@ tests/nsm_client/nlm_sm_inter_svc.c

 tests/nsm_client/nlm_sm_inter_xdr.c

 utils/nfsidmap/nfsidmap

 systemd/nfs-server-generator

+systemd/rpc-pipefs-generator

 systemd/nfs-config.service

 systemd/rpc-gssd.service

 # cscope database files

diff --git a/nfs.conf b/nfs.conf

index 81ece06..0d0ec9b 100644

--- a/nfs.conf

+++ b/nfs.conf

@@ -1,7 +1,10 @@

 #

-# This is a general conifguration for the 

+# This is a general configuration for the

 # NFS daemons and tools

 #

+#[general]

+# pipefs-directory=/var/lib/nfs/rpc_pipefs

+#

 #[exportfs]

 # debug=0

 #

@@ -12,7 +15,6 @@

 # limit-to-legacy-enctypes=0

 # context-timeout=0

 # rpc-timeout=5

-# pipefs-directory=/var/lib/nfs/rpc_pipefs

 # keytab-file=/etc/krb5.keytab

 # cred-cache-directory=

 # preferred-realm=

@@ -42,7 +44,7 @@

 # port=0

 # grace-time=90

 # lease-time=90

-# udp=y

+# udp=n

 # tcp=y

 # vers2=n

 # vers3=y

@@ -65,6 +67,7 @@

 # retry-time=900

 # outgoing-port=

 # outgoing-addr=

+# lift-grace=y

 #

 #[svcgssd]

 # principal=

diff --git a/support/export/xtab.c b/support/export/xtab.c

index 22cf539..d42eeef 100644

--- a/support/export/xtab.c

+++ b/support/export/xtab.c

@@ -14,12 +14,20 @@

 #include <unistd.h>

 #include <stdlib.h>

 #include <string.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <errno.h>

+#include <libgen.h>

 #include "nfslib.h"

 #include "exportfs.h"

 #include "xio.h"

 #include "xlog.h"

 #include "v4root.h"

+#include "misc.h"

+

+static char state_base_dirname[PATH_MAX] = NFS_STATEDIR;

+extern struct state_paths etab;

 int v4root_needed;

 static void cond_rename(char *newfile, char *oldfile);

@@ -65,7 +73,7 @@ xtab_read(char *xtab, char *lockfn, int is_export)

 int

 xtab_export_read(void)

 {

-	return xtab_read(_PATH_ETAB, _PATH_ETABLCK, 1);

+	return xtab_read(etab.statefn, etab.lockfn, 1);

 }

 /*

@@ -112,7 +120,7 @@ xtab_write(char *xtab, char *xtabtmp, char *lockfn, int is_export)

 int

 xtab_export_write()

 {

-	return xtab_write(_PATH_ETAB, _PATH_ETABTMP, _PATH_ETABLCK, 1);

+	return xtab_write(etab.statefn, etab.tmpfn, etab.lockfn, 1);

 }

 /*

@@ -158,3 +166,74 @@ static void cond_rename(char *newfile, char *oldfile)

 	rename(newfile, oldfile);

 	return;

 }

+

+/*

+ * Returns a dynamically allocated, '\0'-terminated buffer

+ * containing an appropriate pathname, or NULL if an error

+ * occurs.  Caller must free the returned result with free(3).

+ */

+static char *

+state_make_pathname(const char *tabname)

+{

+	return generic_make_pathname(state_base_dirname, tabname);

+}

+

+/**

+ * state_setup_basedir - set up basedir

+ * @progname: C string containing name of program, for error messages

+ * @parentdir: C string containing pathname to on-disk state, or NULL

+ *

+ * This runs before logging is set up, so error messages are directed

+ * to stderr.

+ *

+ * Returns true and sets up our basedir, if @parentdir was valid

+ * and usable; otherwise false is returned.

+ */

+_Bool

+state_setup_basedir(const char *progname, const char *parentdir)

+{

+	return generic_setup_basedir(progname, parentdir, state_base_dirname,

+				     PATH_MAX);

+}

+

+int

+setup_state_path_names(const char *progname, const char *statefn,

+		      const char *tmpfn, const char *lockfn,

+		      struct state_paths *paths)

+{

+	paths->statefn = state_make_pathname(statefn);

+	if (!paths->statefn) {

+		fprintf(stderr, "%s: state_make_pathname(%s) failed\n",

+			progname, statefn);

+		goto out_err;

+	}

+	paths->tmpfn = state_make_pathname(tmpfn);

+	if (!paths->tmpfn) {

+		fprintf(stderr, "%s: state_make_pathname(%s) failed\n",

+			progname, tmpfn);

+		goto out_free_statefn;

+	}

+	paths->lockfn = state_make_pathname(lockfn);

+	if (!paths->lockfn) {

+		fprintf(stderr, "%s: state_make_pathname(%s) failed\n",

+			progname, lockfn);

+		goto out_free_tmpfn;

+	}

+	return 1;

+

+out_free_tmpfn:

+	free(paths->tmpfn);

+out_free_statefn:

+	free(paths->statefn);

+out_err:

+	return 0;

+

+}

+

+void

+free_state_path_names(struct state_paths *paths)

+{

+	free(paths->statefn);

+	free(paths->tmpfn);

+	free(paths->lockfn);

+}

diff --git a/support/include/conffile.h b/support/include/conffile.h

index 3fe3a78..20b1a32 100644

--- a/support/include/conffile.h

+++ b/support/include/conffile.h

@@ -48,8 +48,6 @@ struct conf_list {

 	TAILQ_HEAD(conf_list_fields_head, conf_list_node) fields;

 };

-extern char    *conf_path;

-

 extern int      conf_begin(void);

 extern int      conf_decode_base64(uint8_t *, uint32_t *, unsigned char *);

 extern int      conf_end(int, int);

@@ -61,9 +59,8 @@ extern int      conf_get_num(char *, char *, int);

 extern _Bool    conf_get_bool(char *, char *, _Bool);

 extern char    *conf_get_str(char *, char *);

 extern char    *conf_get_section(char *, char *, char *);

-extern void     conf_init(void);

+extern void     conf_init(const char *);

 extern int      conf_match_num(char *, char *, int);

-extern void     conf_reinit(void);

 extern int      conf_remove(int, char *, char *);

 extern int      conf_remove_section(int, char *);

 extern void     conf_report(void);

diff --git a/support/include/misc.h b/support/include/misc.h

index eedc1fe..06e2a0c 100644

--- a/support/include/misc.h

+++ b/support/include/misc.h

@@ -15,6 +15,9 @@

 int	randomkey(unsigned char *keyout, int len);

 int	weakrandomkey(unsigned char *keyout, int len);

+char *generic_make_pathname(const char *, const char *);

+_Bool generic_setup_basedir(const char *, const char *, char *, const size_t);

+

 extern int is_mountpoint(char *path);

 /* size of the file pointer buffers for rpc procfs files */

diff --git a/support/include/nfs/nfs.h b/support/include/nfs/nfs.h

index 15ecc6b..7933ff5 100644

--- a/support/include/nfs/nfs.h

+++ b/support/include/nfs/nfs.h

@@ -16,8 +16,8 @@

 #define NFSD_MINVERS 2

 #define NFSD_MAXVERS 4

-#define NFS4_MINMINOR 1

-#define NFS4_MAXMINOR WORD_BIT

+#define NFS4_MINMINOR 0

+#define NFS4_MAXMINOR (WORD_BIT-1)

 struct nfs_fh_len {

 	int		fh_size;

@@ -27,21 +27,24 @@ struct nfs_fh_len {

 #define NFSCTL_UDPBIT		      (1 << (17 - 1))

 #define NFSCTL_TCPBIT		      (1 << (18 - 1))

+#define NFSCTL_PROTODEFAULT	      (NFSCTL_TCPBIT)

 #define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1))) 

+#define NFSCTL_MINORUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << (_v)))

 #define NFSCTL_UDPUNSET(_cltbits)     ((_cltbits) &= ~NFSCTL_UDPBIT) 

 #define NFSCTL_TCPUNSET(_cltbits)     ((_cltbits) &= ~NFSCTL_TCPBIT) 

 #define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1))) 

+#define NFSCTL_MINORISSET(_cltbits, _v) ((_cltbits) & (1 << (_v)))

 #define NFSCTL_UDPISSET(_cltbits)     ((_cltbits) & NFSCTL_UDPBIT) 

 #define NFSCTL_TCPISSET(_cltbits)     ((_cltbits) & NFSCTL_TCPBIT) 

 #define NFSCTL_VERDEFAULT (0xc)       /* versions 3 and 4 */

 #define NFSCTL_VERSET(_cltbits, _v)   ((_cltbits) |= (1 << ((_v) - 1))) 

+#define NFSCTL_MINORSET(_cltbits, _v)   ((_cltbits) |= (1 << (_v)))

 #define NFSCTL_UDPSET(_cltbits)       ((_cltbits) |= NFSCTL_UDPBIT)

 #define NFSCTL_TCPSET(_cltbits)       ((_cltbits) |= NFSCTL_TCPBIT)

 #define NFSCTL_ANYPROTO(_cltbits)     ((_cltbits) & (NFSCTL_UDPBIT | NFSCTL_TCPBIT))

-#define NFSCTL_ALLBITS (~0)

 #endif /* _NFS_NFS_H */

diff --git a/support/include/nfslib.h b/support/include/nfslib.h

index 1498977..ab8b2bf 100644

--- a/support/include/nfslib.h

+++ b/support/include/nfslib.h

@@ -35,29 +35,24 @@

 #ifndef _PATH_IDMAPDCONF

 #define _PATH_IDMAPDCONF	"/etc/idmapd.conf"

 #endif

-#ifndef _PATH_ETAB

-#define _PATH_ETAB		NFS_STATEDIR "/etab"

-#endif

-#ifndef _PATH_ETABTMP

-#define _PATH_ETABTMP		NFS_STATEDIR "/etab.tmp"

-#endif

-#ifndef _PATH_ETABLCK

-#define _PATH_ETABLCK		NFS_STATEDIR "/.etab.lock"

-#endif

-#ifndef _PATH_RMTAB

-#define _PATH_RMTAB		NFS_STATEDIR "/rmtab"

-#endif

-#ifndef _PATH_RMTABTMP

-#define _PATH_RMTABTMP		_PATH_RMTAB ".tmp"

-#endif

-#ifndef _PATH_RMTABLCK

-#define _PATH_RMTABLCK		NFS_STATEDIR "/.rmtab.lock"

-#endif

 #ifndef _PATH_PROC_EXPORTS

 #define	_PATH_PROC_EXPORTS	"/proc/fs/nfs/exports"

 #define	_PATH_PROC_EXPORTS_ALT	"/proc/fs/nfsd/exports"

 #endif

+#define ETAB		"etab"

+#define ETABTMP		"etab.tmp"

+#define ETABLCK 	".etab.lock"

+#define RMTAB		"rmtab"

+#define RMTABTMP	"rmtab.tmp"

+#define RMTABLCK	".rmtab.lock"

+

+struct state_paths {

+	char *statefn;

+	char *tmpfn;

+	char *lockfn;

+};

+

 /* Maximum number of security flavors on an export: */

 #define SECFLAVOR_COUNT 8

@@ -120,6 +115,10 @@ void			fputrmtabent(FILE *fp, struct rmtabent *xep, long *pos);

 void			fendrmtabent(FILE *fp);

 void			frewindrmtabent(FILE *fp);

+_Bool state_setup_basedir(const char *, const char *);

+int setup_state_path_names(const char *, const char *, const char *, const char *, struct state_paths *);

+void free_state_path_names(struct state_paths *);

+

 /* mydaemon */

 void daemon_init(bool fg);

 void daemon_ready(void);

diff --git a/support/misc/Makefile.am b/support/misc/Makefile.am

index 1048580..8936b0d 100644

--- a/support/misc/Makefile.am

+++ b/support/misc/Makefile.am

@@ -1,6 +1,6 @@

 ## Process this file with automake to produce Makefile.in

 noinst_LIBRARIES = libmisc.a

-libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c

+libmisc_a_SOURCES = tcpwrapper.c from_local.c mountpoint.c file.c

 MAINTAINERCLEANFILES = Makefile.in

diff --git a/support/misc/file.c b/support/misc/file.c

new file mode 100644

index 0000000..63597df

--- /dev/null

+++ b/support/misc/file.c

@@ -0,0 +1,110 @@

+/*

+ * Copyright 2009 Oracle.  All rights reserved.

+ * Copyright 2017 Red Hat, Inc.  All rights reserved.

+ *

+ * This file is part of nfs-utils.

+ *

+ * nfs-utils is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * nfs-utils is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with nfs-utils.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <sys/stat.h>

+

+#include <string.h>

+#include <libgen.h>

+#include <stdio.h>

+#include <errno.h>

+#include <dirent.h>

+#include <stdlib.h>

+#include <stdbool.h>

+

+#include "xlog.h"

+#include "misc.h"

+

+/*

+ * Returns a dynamically allocated, '\0'-terminated buffer

+ * containing an appropriate pathname, or NULL if an error

+ * occurs.  Caller must free the returned result with free(3).

+ */

+__attribute__((__malloc__))

+char *

+generic_make_pathname(const char *base, const char *leaf)

+{

+	size_t size;

+	char *path;

+	int len;

+

+	size = strlen(base) + strlen(leaf) + 2;

+	if (size > PATH_MAX)

+		return NULL;

+

+	path = malloc(size);

+	if (path == NULL)

+		return NULL;

+

+	len = snprintf(path, size, "%s/%s", base, leaf);

+	if ((len < 0) || ((size_t)len >= size)) {

+		free(path);

+		return NULL;

+	}

+

+	return path;

+}

+

+

+/**

+ * generic_setup_basedir - set up basedir

+ * @progname: C string containing name of program, for error messages

+ * @parentdir: C string containing pathname to on-disk state, or NULL

+ * @base: character buffer to contain the basedir that is set up

+ * @baselen: size of @base in bytes

+ *

+ * This runs before logging is set up, so error messages are directed

+ * to stderr.

+ *

+ * Returns true and sets up our basedir, if @parentdir was valid

+ * and usable; otherwise false is returned.

+ */

+_Bool

+generic_setup_basedir(const char *progname, const char *parentdir, char *base,

+		      const size_t baselen)

+{

+	static char buf[PATH_MAX];

+	struct stat st;

+	char *path;

+

+	/* First: test length of name and whether it exists */

+	if ((strlen(parentdir) >= baselen) || (strlen(parentdir) >= PATH_MAX)) {

+		(void)fprintf(stderr, "%s: Directory name too long: %s",

+				progname, parentdir);

+		return false;

+	}

+	if (lstat(parentdir, &st) == -1) {

+		(void)fprintf(stderr, "%s: Failed to stat %s: %s",

+				progname, parentdir, strerror(errno));

+		return false;

+	}

+

+	/* Ensure we have a clean directory pathname */

+	strncpy(buf, parentdir, sizeof(buf));

+	path = dirname(buf);

+	if (*path == '.') {

+		(void)fprintf(stderr, "%s: Unusable directory %s",

+				progname, parentdir);

+		return false;

+	}

+

+	xlog(D_CALL, "Using %s as the state directory", parentdir);

+	strcpy(base, parentdir);

+	return true;

+}

diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c

index e5e2579..9912afa 100644

--- a/support/nfs/cacheio.c

+++ b/support/nfs/cacheio.c

@@ -27,6 +27,8 @@

 #include <time.h>

 #include <errno.h>

+extern struct state_paths etab;

+

 void qword_add(char **bpp, int *lp, char *str)

 {

 	char *bp = *bpp;

@@ -199,7 +201,7 @@ int qword_get_uint(char **bpp, unsigned int *anint)

 }

 /* flush the kNFSd caches.

- * Set the flush time to the mtime of _PATH_ETAB or

+ * Set the flush time to the mtime of the etab state file or

  * if force, to now.

  * the caches to flush are:

  *  auth.unix.ip nfsd.export nfsd.fh

@@ -228,7 +230,7 @@ cache_flush(int force)

 	};

 	now = time(0);

 	if (force ||

-	    stat(_PATH_ETAB, &stb) != 0 ||

+	    stat(etab.statefn, &stb) != 0 ||

 	    stb.st_mtime > now)

 		stb.st_mtime = time(0);

diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c

index e717c1e..efbdc8b 100644

--- a/support/nfs/conffile.c

+++ b/support/nfs/conffile.c

@@ -30,6 +30,10 @@

  * This code was written under funding by Ericsson Radio Systems.

  */

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+

 #include <sys/param.h>

 #include <sys/mman.h>

 #include <sys/socket.h>

@@ -52,7 +56,7 @@

 #pragma GCC visibility push(hidden)

 static void conf_load_defaults(void);

-static int conf_load(int trans, char *path);

+static int conf_load(int trans, const char *path);

 static int conf_set(int , char *, char *, char *, 

 	char *, int , int );

@@ -73,8 +77,10 @@ TAILQ_HEAD (conf_trans_head, conf_trans) conf_trans_queue;

 /*

  * Radix-64 Encoding.

  */

+#if 0

 static const uint8_t bin2asc[]

   = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

+#endif

 static const uint8_t asc2bin[] =

 {

@@ -105,7 +111,6 @@ struct conf_binding {

   int is_default;

 };

-char *conf_path;

 LIST_HEAD (conf_bindings, conf_binding) conf_bindings[256];

 static __inline__ uint8_t

@@ -369,20 +374,8 @@ conf_load_defaults(void)

 	return;

 }

-void

-conf_init (void)

-{

-	unsigned int i;

-

-	for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++)

-		LIST_INIT (&conf_bindings[i]);

-

-	TAILQ_INIT (&conf_trans_queue);

-	conf_reinit();

-}

-

 static int

-conf_load(int trans, char *path)

+conf_load(int trans, const char *path)

 {

 	struct stat sb;

 	if ((stat (path, &sb) == 0) || (errno != ENOENT)) {

@@ -421,15 +414,15 @@ conf_load(int trans, char *path)

 }

 /* Open the config file and map it into our address space, then parse it.  */

-void

-conf_reinit(void)

+static void

+conf_reinit(const char *conf_file)

 {

 	struct conf_binding *cb = 0;

 	int trans;

 	unsigned int i;

 	trans = conf_begin();

-	if (conf_load(trans, conf_path) < 0)

+	if (conf_load(trans, conf_file) < 0)

 		return;

 	/* Load default configuration values.  */

@@ -446,6 +439,20 @@ conf_reinit(void)

 	return;

 }

+void

+conf_init (const char *conf_file)

+{

+	unsigned int i;

+

+	for (i = 0; i < sizeof conf_bindings / sizeof conf_bindings[0]; i++)

+		LIST_INIT (&conf_bindings[i]);

+

+	TAILQ_INIT (&conf_trans_queue);

+

+	if (conf_file == NULL) conf_file=NFS_CONFFILE;

+	conf_reinit(conf_file);

+}

+

 /*

  * Return the numeric value denoted by TAG in section SECTION or DEF

  * if that tag does not exist.

@@ -533,7 +540,7 @@ retry:

 				 * or from environment

 				 */

 				char *env = getenv(cb->value+1);

-				if (env)

+				if (env && *env)

 					return env;

 				section = "environment";

 				tag = cb->value + 1;

diff --git a/support/nfs/rmtab.c b/support/nfs/rmtab.c

index 59dfbdf..2ecb2cc 100644

--- a/support/nfs/rmtab.c

+++ b/support/nfs/rmtab.c

@@ -33,12 +33,14 @@

 static FILE	*rmfp = NULL;

+extern struct state_paths rmtab;

+

 int

 setrmtabent(char *type)

 {

 	if (rmfp)

 		fclose(rmfp);

-	rmfp = fsetrmtabent(_PATH_RMTAB, type);

+	rmfp = fsetrmtabent(rmtab.statefn, type);

 	return (rmfp != NULL);

 }

diff --git a/support/nsm/file.c b/support/nsm/file.c

index aafa755..52f5401 100644

--- a/support/nsm/file.c

+++ b/support/nsm/file.c

@@ -88,6 +88,7 @@

 #include "xlog.h"

 #include "nsm.h"

+#include "misc.h"

 #define RPCARGSLEN	(4 * (8 + 1))

 #define LINELEN		(RPCARGSLEN + SM_PRIV_SIZE * 2 + 1)

@@ -170,25 +171,7 @@ __attribute__((__malloc__))

 static char *

 nsm_make_pathname(const char *directory)

 {

-	size_t size;

-	char *path;

-	int len;

-

-	size = strlen(nsm_base_dirname) + strlen(directory) + 2;

-	if (size > PATH_MAX)

-		return NULL;

-

-	path = malloc(size);

-	if (path == NULL)

-		return NULL;

-

-	len = snprintf(path, size, "%s/%s", nsm_base_dirname, directory);

-	if (error_check(len, size)) {

-		free(path);

-		return NULL;

-	}

-

-	return path;

+	return generic_make_pathname(nsm_base_dirname, directory);

 }

 /*

@@ -293,29 +276,8 @@ out:

 _Bool

 nsm_setup_pathnames(const char *progname, const char *parentdir)

 {

-	static char buf[PATH_MAX];

-	struct stat st;

-	char *path;

-

-	/* First: test length of name and whether it exists */

-	if (lstat(parentdir, &st) == -1) {

-		(void)fprintf(stderr, "%s: Failed to stat %s: %s",

-				progname, parentdir, strerror(errno));

-		return false;

-	}

-

-	/* Ensure we have a clean directory pathname */

-	strncpy(buf, parentdir, sizeof(buf));

-	path = dirname(buf);

-	if (*path == '.') {

-		(void)fprintf(stderr, "%s: Unusable directory %s",

-				progname, parentdir);

-		return false;

-	}

-

-	xlog(D_CALL, "Using %s as the state directory", parentdir);

-	strncpy(nsm_base_dirname, parentdir, sizeof(nsm_base_dirname));

-	return true;

+	return generic_setup_basedir(progname, parentdir, nsm_base_dirname,

+				     PATH_MAX);

 }

 /**

diff --git a/systemd/Makefile.am b/systemd/Makefile.am

index 0d15b9f..eef53c4 100644

--- a/systemd/Makefile.am

+++ b/systemd/Makefile.am

@@ -4,6 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in

 unit_files =  \

     nfs-client.target \

+    rpc_pipefs.target \

     \

     nfs-mountd.service \

     nfs-server.service \

@@ -42,14 +43,23 @@ 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

+EXTRA_PROGRAMS	= nfs-server-generator rpc-pipefs-generator

 genexecdir = $(generator_dir)

+

+COMMON_SRCS = systemd.c systemd.h

+

+nfs_server_generator_SOURCES = $(COMMON_SRCS) nfs-server-generator.c

+

+rpc_pipefs_generator_SOURCES = $(COMMON_SRCS) rpc-pipefs-generator.c

+

 nfs_server_generator_LDADD = ../support/export/libexport.a \

 			     ../support/nfs/libnfs.a \

 			     ../support/misc/libmisc.a

+rpc_pipefs_generator_LDADD = ../support/nfs/libnfs.a

+

 if INSTALL_SYSTEMD

-genexec_PROGRAMS = nfs-server-generator

+genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator

 install-data-hook: $(unit_files)

 	mkdir -p $(DESTDIR)/$(unitdir)

 	cp $(unit_files) $(DESTDIR)/$(unitdir)

diff --git a/systemd/nfs-blkmap.service b/systemd/nfs-blkmap.service

index ddc324e..2bbcee6 100644

--- a/systemd/nfs-blkmap.service

+++ b/systemd/nfs-blkmap.service

@@ -2,8 +2,8 @@

 Description=pNFS block layout mapping daemon

 DefaultDependencies=no