Sync systemd units.

14 files changed, 53 insertions, 47 deletions

diff --git a/systemd-units/nfs-utils/files/nfs3-client.target.4 b/systemd-units/nfs-utils/files/nfs3-client.target.8
index 9c35888..d687df0 100644
--- a/systemd-units/nfs-utils/files/nfs3-client.target.4
+++ b/systemd-units/nfs-utils/files/nfs3-client.target.8
@@ -2,7 +2,7 @@
 Description=Dependencies for NFSv3 mounts
 Requires=rpc.statd.service
 Wants=sm-notify.service
-After=rpc.statd.service sm-notify.service
+After=rpc.statd.service
 Before=remote-fs.target
 
 [Install]
diff --git a/systemd-units/nfs-utils/files/nfs4-client.target.4 b/systemd-units/nfs-utils/files/nfs4-client.target.8
index 1f6745f..5a96b9d 100644
--- a/systemd-units/nfs-utils/files/nfs4-client.target.4
+++ b/systemd-units/nfs-utils/files/nfs4-client.target.8
@@ -4,7 +4,7 @@ Requires=rpc.idmapd.service
 Requires=rpc.statd.service
 Wants=sm-notify.service
 Wants=rpc.gssd.service
-After=rpc.idmapd.service rpc.statd.service sm-notify.service rpc.gssd.service
+After=rpc.idmapd.service rpc.statd.service rpc.gssd.service
 Before=remote-fs.target
 
 [Install]
diff --git a/systemd-units/nfs-utils/files/proc-fs-nfsd.mount.4 b/systemd-units/nfs-utils/files/proc-fs-nfsd.mount.8
index 060a206..060a206 100644
--- a/systemd-units/nfs-utils/files/proc-fs-nfsd.mount.4
+++ b/systemd-units/nfs-utils/files/proc-fs-nfsd.mount.8
diff --git a/systemd-units/nfs-utils/files/rpc.gssd.service.4 b/systemd-units/nfs-utils/files/rpc.gssd.service.8
index 2776d31..99db47d 100644
--- a/systemd-units/nfs-utils/files/rpc.gssd.service.4
+++ b/systemd-units/nfs-utils/files/rpc.gssd.service.8
@@ -1,8 +1,8 @@
 [Unit]
 Description=NFS rpcsec_gss daemon
 Requires=var-lib-nfs-rpc_pipefs.mount
-Requires=rpcbind.service
-After=syslog.target var-lib-nfs-rpc_pipefs.mount rpcbind.service
+Requires=rpcbind.target
+After=syslog.target var-lib-nfs-rpc_pipefs.mount rpcbind.target
 
 [Service]
 ExecStart=/usr/sbin/rpc.gssd -f
diff --git a/systemd-units/nfs-utils/files/rpc.idmapd.service.4 b/systemd-units/nfs-utils/files/rpc.idmapd.service.8
index 05f396e..0020016 100644
--- a/systemd-units/nfs-utils/files/rpc.idmapd.service.4
+++ b/systemd-units/nfs-utils/files/rpc.idmapd.service.8
@@ -1,8 +1,8 @@
 [Unit]
 Description=NFSv4 ID-name mapping daemon
 Wants=var-lib-nfs-rpc_pipefs.mount
-Requires=network.target var-lib-nfs-rpc_pipefs.mount rpcbind.service
-After=syslog.target network.target named.service rpcbind.service
+Requires=network.target var-lib-nfs-rpc_pipefs.mount rpcbind.target
+After=syslog.target network.target named.service rpcbind.target
 
 [Service]
 ExecStart=/usr/sbin/rpc.idmapd -f
diff --git a/systemd-units/nfs-utils/files/rpc.statd.service.4 b/systemd-units/nfs-utils/files/rpc.statd.service.8
index a68e033..9136413 100644
--- a/systemd-units/nfs-utils/files/rpc.statd.service.4
+++ b/systemd-units/nfs-utils/files/rpc.statd.service.8
@@ -1,7 +1,7 @@
 [Unit]
 Description=NFS file locking service
-Requires=rpcbind.service
-After=syslog.target network.target rpcbind.service
+Requires=rpcbind.target
+After=syslog.target network.target rpcbind.target
 
 [Service]
 ExecStart=/sbin/rpc.statd --no-notify -d -F
diff --git a/systemd-units/nfs-utils/files/sm-notify.service.4 b/systemd-units/nfs-utils/files/sm-notify.service.4
deleted file mode 100644
index d1fc89b..0000000
--- a/systemd-units/nfs-utils/files/sm-notify.service.4
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=NFS reboot notification service
-Requires=rpcbind.service
-After=syslog.target network.target rpcbind.service
-
-[Service]
-ExecStart=/usr/sbin/sm-notify -d
diff --git a/systemd-units/nfs-utils/files/sm-notify.service.8 b/systemd-units/nfs-utils/files/sm-notify.service.8
new file mode 100644
index 0000000..c128062
--- /dev/null
+++ b/systemd-units/nfs-utils/files/sm-notify.service.8
@@ -0,0 +1,11 @@
+[Unit]
+Description=NFS reboot notification service
+Requires=rpcbind.target
+After=syslog.target network.target rpcbind.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/sm-notify -d
+RemainAfterExit=yes
+# sm-notify outputs the same to stderr & syslog
+StandardError=null
diff --git a/systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.4 b/systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.8
index e507290..e507290 100644
--- a/systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.4
+++ b/systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.8
diff --git a/systemd-units/nfs-utils/nfs-utils-4.ebuild b/systemd-units/nfs-utils/nfs-utils-4.ebuild
deleted file mode 100644
index b5b1ae6..0000000
--- a/systemd-units/nfs-utils/nfs-utils-4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit systemd
-
-DESCRIPTION="Systemd units for net-fs/nfs-utils"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	systemd_newunit "${FILESDIR}"/nfs3-client.target.4 nfs3-client.target
-	systemd_newunit "${FILESDIR}"/nfs4-client.target.4 nfs4-client.target
-	systemd_newunit "${FILESDIR}"/proc-fs-nfsd.mount.4 proc-fs-nfsd.mount
-	systemd_newunit "${FILESDIR}"/rpc.gssd.service.4 rpc.gssd.service
-	systemd_newunit "${FILESDIR}"/rpc.idmapd.service.4 rpc.idmapd.service
-	systemd_newunit "${FILESDIR}"/rpc.statd.service.4 rpc.statd.service
-	systemd_newunit "${FILESDIR}"/sm-notify.service.4 sm-notify.service
-	systemd_newunit "${FILESDIR}"/var-lib-nfs-rpc_pipefs.mount.4 var-lib-nfs-rpc_pipefs.mount
-}
diff --git a/systemd-units/nfs-utils/nfs-utils-8.ebuild b/systemd-units/nfs-utils/nfs-utils-8.ebuild
new file mode 100644
index 0000000..9a795dd
--- /dev/null
+++ b/systemd-units/nfs-utils/nfs-utils-8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit systemd
+
+DESCRIPTION="Systemd units for net-fs/nfs-utils"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+	systemd_newunit "${FILESDIR}"/nfs3-client.target.8 nfs3-client.target
+	systemd_newunit "${FILESDIR}"/nfs4-client.target.8 nfs4-client.target
+	systemd_newunit "${FILESDIR}"/proc-fs-nfsd.mount.8 proc-fs-nfsd.mount
+	systemd_newunit "${FILESDIR}"/rpc.gssd.service.8 rpc.gssd.service
+	systemd_newunit "${FILESDIR}"/rpc.idmapd.service.8 rpc.idmapd.service
+	systemd_newunit "${FILESDIR}"/rpc.statd.service.8 rpc.statd.service
+	systemd_newunit "${FILESDIR}"/sm-notify.service.8 sm-notify.service
+	systemd_newunit "${FILESDIR}"/var-lib-nfs-rpc_pipefs.mount.8 var-lib-nfs-rpc_pipefs.mount
+}
diff --git a/systemd-units/rpcbind/files/rpcbind.service.3 b/systemd-units/rpcbind/files/rpcbind.service.4
index f93be9a..802de07 100644
--- a/systemd-units/rpcbind/files/rpcbind.service.3
+++ b/systemd-units/rpcbind/files/rpcbind.service.4
@@ -1,7 +1,9 @@
 [Unit]
-Description=RPC bind service
+Description=RPC program number mapper service
 Requires=rpcbind.socket
+Wants=rpcbind.target
 After=syslog.target network.target
+Before=rpcbind.target
 
 [Service]
 # use --debug not to fork
diff --git a/systemd-units/rpcbind/files/rpcbind.socket.3 b/systemd-units/rpcbind/files/rpcbind.socket.4
index d63c1d9..d63c1d9 100644
--- a/systemd-units/rpcbind/files/rpcbind.socket.3
+++ b/systemd-units/rpcbind/files/rpcbind.socket.4
diff --git a/systemd-units/rpcbind/rpcbind-3.ebuild b/systemd-units/rpcbind/rpcbind-4.ebuild
index 7e6424d..00cb4a3 100644
--- a/systemd-units/rpcbind/rpcbind-3.ebuild
+++ b/systemd-units/rpcbind/rpcbind-4.ebuild
@@ -18,6 +18,6 @@ IUSE=""
 S=${WORKDIR}
 
 src_install() {
-	systemd_newunit "${FILESDIR}"/rpcbind.service.3 rpcbind.service
-	systemd_newunit "${FILESDIR}"/rpcbind.socket.3 rpcbind.socket
+	systemd_newunit "${FILESDIR}"/rpcbind.service.4 rpcbind.service
+	systemd_newunit "${FILESDIR}"/rpcbind.socket.4 rpcbind.socket
 }