nfsutils: version bump 1.3.0 -> 1.3.3

Cleanup and simplify rules while at it.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

13 files changed, 178 insertions, 260 deletions

diff --git a/patches/nfs-utils-1.3.0/0001-start-statd-use-correct-PATH-and-unit-name.patch b/patches/nfs-utils-1.3.0/0001-start-statd-use-correct-PATH-and-unit-name.patch
deleted file mode 100644
index 1ce8a071c..000000000
--- a/patches/nfs-utils-1.3.0/0001-start-statd-use-correct-PATH-and-unit-name.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 9 Apr 2014 14:37:28 +0200
-Subject: [PATCH] start-statd: use correct PATH and unit name
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- utils/statd/start-statd | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/utils/statd/start-statd b/utils/statd/start-statd
-index cde3583..233a386 100644
---- a/utils/statd/start-statd
-+++ b/utils/statd/start-statd
-@@ -4,8 +4,8 @@
- # /var/run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
--PATH=/sbin:/usr/sbin
--if systemctl start statd.service
-+PATH=/sbin:/usr/sbin:/bin:/usr/bin
-+if systemctl start rpc-statd.service
- then :
- else
-     exec rpc.statd --no-notify
diff --git a/patches/nfs-utils-1.3.0/series b/patches/nfs-utils-1.3.0/series
deleted file mode 100644
index 947661a26..000000000
--- a/patches/nfs-utils-1.3.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-start-statd-use-correct-PATH-and-unit-name.patch
-# 8af0056951f555f77c54813c4e8a4bd6  - git-ptx-patches magic
diff --git a/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch b/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
new file mode 100644
index 000000000..28fbcc087
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
@@ -0,0 +1,45 @@
+From: Steve Dickson <steved@redhat.com>
+Date: Mon, 9 Nov 2015 11:28:30 -0500
+Subject: [PATCH] systemd: Decouple the starting and stopping of
+ rpcbind/nfs-server
+
+Commit b98f2af15 introduced a regression that cause the
+starting and stop of rpcbind and the nfs-server to
+be depended on each other
+
+The starting of the NFS server should start rpcbind
+but bring rpcbind down should not bring the NFS
+server down.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ systemd/nfs-server.service | 2 +-
+ systemd/rpc-statd.service  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
+index 12b02f26f9ce..317e5d689767 100644
+--- a/systemd/nfs-server.service
++++ b/systemd/nfs-server.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=NFS server and services
+ DefaultDependencies=no
+-Requires= network.target proc-fs-nfsd.mount rpcbind.service
++Requires= network.target proc-fs-nfsd.mount rpcbind.target
+ Requires= nfs-mountd.service
+ Wants=rpc-statd.service nfs-idmapd.service
+ Wants=rpc-statd-notify.service
+diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service
+index 14604d783ddf..f16ea425dc77 100644
+--- a/systemd/rpc-statd.service
++++ b/systemd/rpc-statd.service
+@@ -3,7 +3,7 @@ Description=NFS status monitor for NFSv2/3 locking.
+ DefaultDependencies=no
+ Conflicts=umount.target
+ Requires=nss-lookup.target rpcbind.target
+-After=network.target nss-lookup.target rpcbind.target
++After=network.target nss-lookup.target rpcbind.service
+ 
+ PartOf=nfs-utils.service
+ 
diff --git a/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch b/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch
new file mode 100644
index 000000000..efc8ef80a
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/0002-rpcgen-don-t-link-to-libtirpc.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 11 Jan 2016 15:48:00 +0100
+Subject: [PATCH] rpcgen: don't link to libtirpc
+
+It's not necessay and causes problems when cross-compiling:
+rpcgen is a host-tool and configure only checks for a target libtirpc.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ tools/rpcgen/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
+index 8a9ec89cea76..51a2bfa006f6 100644
+--- a/tools/rpcgen/Makefile.am
++++ b/tools/rpcgen/Makefile.am
+@@ -12,7 +12,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \
+ rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD)
+ rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD)
+ rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD)
+-rpcgen_LDADD=$(LIBTIRPC)
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
diff --git a/patches/nfs-utils-1.3.3/autogen.sh b/patches/nfs-utils-1.3.3/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/nfs-utils-1.3.3/series b/patches/nfs-utils-1.3.3/series
new file mode 100644
index 000000000..1b88a647d
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
+0002-rpcgen-don-t-link-to-libtirpc.patch
+# 5b8eb83230f35a110507daeddd563ff0  - git-ptx-patches magic
diff --git a/projectroot/etc/exports b/projectroot/etc/exports
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/projectroot/etc/exports
diff --git a/projectroot/lib/systemd/system/nfs.target b/projectroot/lib/systemd/system/nfs.target
deleted file mode 100644
index ea1b87c9c..000000000
--- a/projectroot/lib/systemd/system/nfs.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=NFS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/projectroot/lib/systemd/system/rpc-statd.service b/projectroot/lib/systemd/system/rpc-statd.service
deleted file mode 100644
index 3c2bb2c71..000000000
--- a/projectroot/lib/systemd/system/rpc-statd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=NFS status monitor for NFSv2/3 locking.
-DefaultDependencies=no
-Conflicts=umount.target
-Requires=nss-lookup.target rpcbind.target
-After=network.target nss-lookup.target rpcbind.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/rpc.statd --no-notify
diff --git a/projectroot/lib/systemd/system/var-lib-nfs.mount b/projectroot/lib/systemd/system/var-lib-nfs.mount
new file mode 100644
index 000000000..21da80b75
--- /dev/null
+++ b/projectroot/lib/systemd/system/var-lib-nfs.mount
@@ -0,0 +1,8 @@
+[Unit]
+Before=local-fs.target
+
+[Mount]
+What=tmpfs
+Where=/var/lib/nfs
+Type=tmpfs
+Options=nosuid,nodev,noexec,mode=0755,size=1M
diff --git a/projectroot/usr/lib/tmpfiles.d/nfs.conf b/projectroot/usr/lib/tmpfiles.d/nfs.conf
index 593d7cd45..e37b7f494 100644
--- a/projectroot/usr/lib/tmpfiles.d/nfs.conf
+++ b/projectroot/usr/lib/tmpfiles.d/nfs.conf
@@ -1,6 +1,6 @@
-d /var/lib/nfs 0755 @RPCUSER@ root -
-f /var/lib/nfs/etab 0644 @RPCUSER@ root -
-f /var/lib/nfs/rmtab 0644 @RPCUSER@ root -
-f /var/lib/nfs/xtab 0600 @RPCUSER@ root -
-d /var/lib/nfs/sm 0700 @RPCUSER@ root -
-d /var/lib/nfs/sm.bak 0700 @RPCUSER@ root -
+d /var/lib/nfs 0755 rpcuser root -
+f /var/lib/nfs/etab 0644 rpcuser root -
+f /var/lib/nfs/rmtab 0644 rpcuser root -
+f /var/lib/nfs/xtab 0600 rpcuser root -
+d /var/lib/nfs/sm 0700 rpcuser root -
+d /var/lib/nfs/sm.bak 0700 rpcuser root -
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index 9fca268a9..c813b4745 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -2,111 +2,35 @@
 menuconfig NFSUTILS
 	tristate
 	prompt "nfsutils                      "
-	select GCCLIBS_GCC_S	if NFSUTILS_INSTALL_NFSSTAT
-	# we need libblkid
+	select GCCLIBS_GCC_S
 	select LIBBLKID
-	select TCPWRAPPER	if NFSUTILS_WITH_TCPWRAPPERS
-	select LIBEVENT		if NFSUTILS_V4
+	select UTIL_LINUX_NG
+	select UTIL_LINUX_NG_LIBMOUNT
+	select RPCBIND			if RUNTIME
+	select LIBTIRPC			if GLOBAL_IPV6
 	help
 	  The Sun Network Filesystem (NFS) protocol provides transparent remote
-   	  access to shared files across networks.  The NFS protocol is designed
-   	  to be portable across different machines, operating systems, network
-   	  architectures, and transport protocols.  This portability is achieved
-   	  through the use of Remote Procedure Call (RPC) primitives built on
-   	  top of an eXternal Data Representation (XDR).  Implementations
-   	  already exist for a variety of machines, from personal computers to
-	  supercomputers. See RFC1094 for Details.
-	  RFC1094 URL: http://www.ietf.org/rfc/rfc1094.txt
-
-	  PTXdist currently supports version 2 and 3 of the NFS protocol,
-	  but not NFSv4. Patches are welcome. You will find the NFSv4 protocol
-	  specification in RFC3530: http://www.ietf.org/rfc/rfc3530.txt
-
-# -----
+	  access to shared files across networks. The NFS protocol is designed
+	  to be portable across different machines, operating systems, network
+	  architectures, and transport protocols.
 
 if NFSUTILS
 
-comment "build options"
-
-config	NFSUTILS_V4
+config NFSUTILS_CLIENT
 	bool
-	depends on BROKEN
-	prompt "Enable support for NFSv4"
+	prompt "client"
 	help
-          Enable support for version 4 of the NFS protocol.
+	  Install all tools and daemons to mount nfs filesystems.
 
-config	NFSUTILS_V41
+config NFSUTILS_SERVER
 	bool
-	depends on NFSUTILS_V4
-	depends on BROKEN
-	prompt "Enable support for NFSv4.1"
+	prompt "server"
 	help
-          Enable support for version 4.1 of the NFS protocol.
-
-config	NFSUTILS_WITH_TCPWRAPPERS
-	bool
-	prompt "Use TCP Wrappers"
-
-choice
-	prompt "statd's userid"
-	default NFSUTILS_RPCUSER_UID
-
-	config NFSUTILS_RPCUSER_UID
-		bool
-		prompt "rpcuser"
-		help
-		  rpc.statd runs as user rpcuser
-
-	config NFSUTILS_NOBODY_UID
-		bool
-		prompt "nobody"
-		help
-		  rpc.statd runs as user nobody
-
-endchoice
-
-# -----
-
-comment "install options"
-
-config	NFSUTILS_INSTALL_EXPORTFS
-	bool
-	prompt "Install exportfs"
-
-config	NFSUTILS_INSTALL_MOUNTD
-	bool
-	select NFSUTILS_INSTALL_EXPORTFS
-	prompt "Install rpc.mountd"
-
-config  NFSUTILS_INSTALL_MOUNT
-	bool
-	prompt "Install mount/umount"
-
-config	NFSUTILS_INSTALL_NFSD
-	bool
-	prompt "Install rpc.nfsd"
-
-config	NFSUTILS_INSTALL_NFSSTAT
-	bool
-	prompt "Install nfsstat"
-
-config  NFSUTILS_INSTALL_SHOWMOUNT
-	bool
-	prompt "Install showmount"
-
-config  NFSUTILS_INSTALL_STATD
-	bool
-	prompt "Install rpc.statd"
-# this feature needs /var/lib
-	select ROOTFS_VAR
-	select ROOTFS_VAR_LIB
-
-# -----
-
-comment "runtime options"
+	  Install all tools and daemons to run a NFS server.
 
 config NFSUTILS_NFSD_STARTSCRIPT
 	bool
+	depends on NFSUTILS_SERVER
 	default y
 	prompt "install /etc/init.d/nfsd"
 
@@ -116,12 +40,4 @@ config NFSUTILS_SYSTEMD_UNIT
 	depends on SYSTEMD
 	prompt "install systemd unit files"
 
-config NFSUTILS_INSTALL_USER_EXPORTS
-	bool
-	prompt "Install user's /etc/exports"
-	help
-	  This installs a user defined /etc/exports. PTXdist
-	  uses files projectroot/etc/exports in your local
-	  project
-
 endif
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index 81aa08a38..467bcdc60 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_NFSUTILS) += nfsutils
 #
 # Paths and names
 #
-NFSUTILS_VERSION	:= 1.3.0
-NFSUTILS_MD5		:= 3ac3726eda563946d1f44ac3e5b61d56
+NFSUTILS_VERSION	:= 1.3.3
+NFSUTILS_MD5		:= 9b87d890669eaaec8e97a2b0a35b2665
 NFSUTILS		:= nfs-utils-$(NFSUTILS_VERSION)
 NFSUTILS_SUFFIX		:= tar.bz2
 NFSUTILS_URL		:= $(call ptx/mirror, SF, nfs/$(NFSUTILS).$(NFSUTILS_SUFFIX))
@@ -29,68 +29,40 @@ NFSUTILS_LICENSE	:= GPL-2.0+
 # Prepare
 # ----------------------------------------------------------------------------
 
-NFSUTILS_PATH	:= PATH=$(CROSS_PATH)
-NFSUTILS_ENV 	:= \
+NFSUTILS_CONF_ENV	:= \
 	$(CROSS_ENV) \
 	knfsd_cv_bsd_signals=no
 
 #
 # autoconf
 #
-NFSUTILS_AUTOCONF := \
+NFSUTILS_CONF_TOOL	:= autoconf
+NFSUTILS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-nfsv4 \
+	--disable-nfsv41 \
 	--disable-gss \
+	--disable-svcgss \
 	--disable-kprefix \
-	--disable-tirpc \
-	--disable-ipv6 \
+	--disable-uuid \
+	--$(call ptx/endis, PTXCONF_NFSUTILS_CLIENT)-mount \
+	--$(call ptx/endis, PTXCONF_NFSUTILS_CLIENT)-libmount-mount \
+	--$(call ptx/endis, PTXCONF_GLOBAL_IPV6)-tirpc \
+	$(GLOBAL_IPV6_OPTION) \
+	--disable-mountconfig \
+	--disable-nfsdcltrack \
+	--enable-osdlogin \
 	--disable-caps \
-	--enable-shared \
-	--enable-static \
-	--with-rpcgen=internal \
-	--disable-libmount-mount
-
-# don't trust the default value. Set it as we use it here
-NFSUTILS_AUTOCONF += \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--with-statedir=/var/lib/nfs \
-	--with-statdpath=/var/lib/nfs
-
-ifdef PTXCONF_NFSUTILS_V4
-NFSUTILS_AUTOCONF += --enable-nfsv4
-else
-NFSUTILS_AUTOCONF += --disable-nfsv4
-endif
-
-ifdef PTXCONF_NFSUTILS_V41
-NFSUTILS_AUTOCONF += --enable-nfsv41
-else
-NFSUTILS_AUTOCONF += --disable-nfsv41
-endif
-
-ifdef PTXCONF_NFSUTILS_WITH_TCPWRAPPERS
-NFSUTILS_AUTOCONF += --with-tcp-wrappers=$(SYSROOT)
-else
-NFSUTILS_AUTOCONF += --without-tcp-wrappers
-endif
-
-ifdef PTXCONF_NFSUTILS_RPCUSER_UID
-NFSUTILS_RPCUSER_UID := 65533
-endif
-ifdef PTXCONF_NFSUTILS_NOBODY_UID
-NFSUTILS_RPCUSER_UID := 65534
-endif
-
-NFSUTILS_AUTOCONF += --with-statduser=$(NFSUTILS_RPCUSER_UID)
-
-#  --disable-uuid          Exclude uuid support to avoid buggy libblkid
-#  --enable-mount          Create mount.nfs and don't use the util-linux
-#                          mount(8) functionality. [default=yes]
-#  --with-start-statd=scriptname
-#                          When an nfs filesystems is mounted with locking, run
-#                          this script
-#  --with-tcp-wrappers[=PATH]      Enable tcpwrappers support
-#                 (optionally in PATH)
-#  --with-krb5=DIR         use Kerberos v5 installation in DIR
+	--with-statdpath=/var/lib/nfs \
+	--with-statduser=rpcuser \
+	--with-systemd=/lib/systemd/system \
+	--with-rpcgen=internal \
+	--without-mountfile \
+	--without-tcp-wrappers \
+	--without-krb5 \
+	--without-gssglue
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -105,72 +77,47 @@ $(STATEDIR)/nfsutils.targetinstall:
 	@$(call install_fixup, nfsutils,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
 	@$(call install_fixup, nfsutils,DESCRIPTION,missing)
 
-ifdef PTXCONF_NFSUTILS_INSTALL_EXPORTFS
-	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/exportfs)
-endif
-
-ifdef PTXCONF_NFSUTILS_INSTALL_MOUNTD
-	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.mountd)
-endif
-
-ifdef PTXCONF_NFSUTILS_INSTALL_NFSD
-	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.nfsd)
-endif
-
-ifdef PTXCONF_NFSUTILS_INSTALL_NFSSTAT
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsstat)
-endif
-
-ifdef PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT
+	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/nfsiostat)
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/showmount)
-endif
 
-ifdef PTXCONF_NFSUTILS_INSTALL_STATD
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.statd)
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/start-statd)
 	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/sm-notify)
-endif
-
-ifdef PTXCONF_NFSUTILS_INSTALL_MOUNT
-	@$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/mount.nfs)
-	@$(call install_link, nfsutils, mount.nfs, /sbin/umount.nfs)
-ifdef PTXCONF_NFSUTILS_V4
-	@$(call install_link, nfsutils, mount.nfs, /sbin/mount.nfs4)
-	@$(call install_link, nfsutils, mount.nfs, /sbin/umount.nfs4)
-endif
-endif
 
-#	#
-#	# create the /var/lib/nfs folder
-#	# for locking this folder must be persistent on server side!
-#	# Do not use tmpfs or any other non persistent filesystem.
-#	#
-
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0755, \
+	@$(call install_copy, nfsutils, rpcuser, 0, 0755, \
 		/var/lib/nfs)
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0644, -, \
+
+ifdef PTXCONF_NFSUTILS_SYSTEMD_UNIT
+	@$(call install_alternative, nfsutils, 0, 0, 0644, \
+		/usr/lib/tmpfiles.d/nfs.conf)
+else
+	@$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \
 		/var/lib/nfs/etab)
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0644, -, \
+	@$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \
 		/var/lib/nfs/rmtab)
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0644, -, \
+	@$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \
 		/var/lib/nfs/xtab)
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0644, -, \
+	@$(call install_copy, nfsutils, rpcuser, 0, 0644, -, \
 		/var/lib/nfs/state)
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0755, \
+	@$(call install_copy, nfsutils, rpcuser, 0, 0755, \
 		/var/lib/nfs/sm)
-	@$(call install_copy, nfsutils, $(NFSUTILS_RPCUSER_UID), 0, 0755, \
+	@$(call install_copy, nfsutils, rpcuser, 0, 0755, \
 		/var/lib/nfs/sm.bak)
+endif
+
+ifdef PTXCONF_NFSUTILS_CLIENT
+	@$(call install_copy, nfsutils, 0, 0, 0755, -, /sbin/mount.nfs)
+	@$(call install_link, nfsutils, mount.nfs, /sbin/umount.nfs)
+endif
+
+ifdef PTXCONF_NFSUTILS_SERVER
+	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.nfsd)
+	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/rpc.mountd)
+	@$(call install_copy, nfsutils, 0, 0, 0755, -, /usr/sbin/exportfs)
 
 	@$(call install_alternative, nfsutils, 0, 0, 0644, \
-		/usr/lib/tmpfiles.d/nfs.conf)
-	@$(call install_replace, nfsutils, /usr/lib/tmpfiles.d/nfs.conf, \
-		@RPCUSER@, $(NFSUTILS_RPCUSER_UID))
-
-ifdef PTXCONF_NFSUTILS_INSTALL_USER_EXPORTS
-#	# install user defined exportfs
-	@$(call install_copy, nfsutils, 0, 0, 0644, \
-		${PTXDIST_WORKSPACE}/projectroot/etc/exports, \
-		/etc/exports, n)
+		/etc/exports)
 endif
 
 #	#
@@ -187,22 +134,37 @@ ifneq ($(call remove_quotes,$(PTXCONF_NFSUTILS_NFSD_BBINIT_LINK)),)
 endif
 endif
 endif
+
 ifdef PTXCONF_NFSUTILS_SYSTEMD_UNIT
 	@$(call install_alternative, nfsutils, 0, 0, 0644, \
-		/lib/systemd/system/nfs.target)
-	@$(call install_link, nfsutils, ../nfs.target, \
-		/lib/systemd/system/multi-user.target.wants/nfs.target)
+		/lib/systemd/system/rpc-statd.service)
+	@$(call install_alternative, nfsutils, 0, 0, 0644, \
+		/lib/systemd/system/rpc-statd-notify.service)
+	@$(call install_alternative, nfsutils, 0, 0, 0644, \
+		/lib/systemd/system/var-lib-nfs.mount)
+	@$(call install_link, nfsutils, ../var-lib-nfs.mount, \
+		/lib/systemd/system/local-fs.target.requires/var-lib-nfs.mount)
 
-ifdef PTXCONF_NFSUTILS_INSTALL_STATD
+ifdef PTXCONF_NFSUTILS_CLIENT
 	@$(call install_alternative, nfsutils, 0, 0, 0644, \
-		/lib/systemd/system/rpc-statd.service)
+		/lib/systemd/system/nfs-client.target)
+	@$(call install_link, nfsutils, ../nfs-client.target, \
+		/lib/systemd/system/multi-user.target.wants/nfs-client.target)
+	@$(call install_link, nfsutils, ../nfs-client.target, \
+		/lib/systemd/system/remote-fs.target.wants/nfs-client.target)
+endif
+ifdef PTXCONF_NFSUTILS_SERVER
+	@$(call install_alternative, nfsutils, 0, 0, 0644, \
+		/lib/systemd/system/proc-fs-nfsd.mount)
+	@$(call install_alternative, nfsutils, 0, 0, 0644, \
+		/lib/systemd/system/nfs-mountd.service)
+	@$(call install_alternative, nfsutils, 0, 0, 0644, \
+		/lib/systemd/system/nfs-server.service)
+	@$(call install_link, nfsutils, ../nfs-server.service, \
+		/lib/systemd/system/multi-user.target.wants/nfs-server.service)
 endif
 endif
 	@$(call install_finish, nfsutils)
-
-# FIXME: not installed yet:
-# /sbin/rpcdebug
-
 	@$(call touch)
 
 # vim: syntax=make