[gentoo-commits] dev/mgorny:master commit in: systemd-units/nfs-utils/files/, systemd-units/nfs-utils/

[Michał Górny]

commit:     e4f6cf5ef2722e34bc96309a109f5a277ccf86d4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 21:06:03 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 21:06:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e4f6cf5e

Sync systemd unit ebuilds.

---
 ...{nfs3-client.target.8 => nfs3-client.target.10} |    2 +-
 ...{nfs4-client.target.8 => nfs4-client.target.10} |    7 +++--
 ...{proc-fs-nfsd.mount.8 => proc-fs-nfsd.mount.10} |    0
 .../{rpc.gssd.service.8 => rpc.gssd.service.10}    |    1 +
 ...{rpc.idmapd.service.8 => rpc.idmapd.service.10} |    1 +
 .../{rpc.statd.service.8 => rpc.statd.service.10}  |    1 +
 .../{sm-notify.service.8 => sm-notify.service.10}  |    0
 ...efs.mount.8 => var-lib-nfs-rpc_pipefs.mount.10} |    0
 systemd-units/nfs-utils/nfs-utils-10.ebuild        |   29 ++++++++++++++++++++
 systemd-units/nfs-utils/nfs-utils-8.ebuild         |   29 --------------------
 10 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/systemd-units/nfs-utils/files/nfs3-client.target.8 b/systemd-units/nfs-utils/files/nfs3-client.target.10
similarity index 85%
rename from systemd-units/nfs-utils/files/nfs3-client.target.8
rename to systemd-units/nfs-utils/files/nfs3-client.target.10
index d687df0..7d50192 100644
--- a/systemd-units/nfs-utils/files/nfs3-client.target.8
+++ b/systemd-units/nfs-utils/files/nfs3-client.target.10
@@ -1,6 +1,6 @@
 [Unit]
 Description=Dependencies for NFSv3 mounts
-Requires=rpc.statd.service
+BindTo=rpc.statd.service
 Wants=sm-notify.service
 After=rpc.statd.service
 Before=remote-fs.target

diff --git a/systemd-units/nfs-utils/files/nfs4-client.target.8 b/systemd-units/nfs-utils/files/nfs4-client.target.10
similarity index 59%
rename from systemd-units/nfs-utils/files/nfs4-client.target.8
rename to systemd-units/nfs-utils/files/nfs4-client.target.10
index 5a96b9d..b977286 100644
--- a/systemd-units/nfs-utils/files/nfs4-client.target.8
+++ b/systemd-units/nfs-utils/files/nfs4-client.target.10
@@ -1,9 +1,10 @@
 [Unit]
 Description=Dependencies for NFSv4 mounts
-Requires=rpc.idmapd.service
-Requires=rpc.statd.service
+BindTo=rpc.idmapd.service
+BindTo=rpc.statd.service
 Wants=sm-notify.service
-Wants=rpc.gssd.service
+# rpc.gssd is not obligatory only when not using encryption
+#Wants=rpc.gssd.service
 After=rpc.idmapd.service rpc.statd.service rpc.gssd.service
 Before=remote-fs.target
 

diff --git a/systemd-units/nfs-utils/files/proc-fs-nfsd.mount.8 b/systemd-units/nfs-utils/files/proc-fs-nfsd.mount.10
similarity index 100%
rename from systemd-units/nfs-utils/files/proc-fs-nfsd.mount.8
rename to systemd-units/nfs-utils/files/proc-fs-nfsd.mount.10

diff --git a/systemd-units/nfs-utils/files/rpc.gssd.service.8 b/systemd-units/nfs-utils/files/rpc.gssd.service.10
similarity index 91%
rename from systemd-units/nfs-utils/files/rpc.gssd.service.8
rename to systemd-units/nfs-utils/files/rpc.gssd.service.10
index 99db47d..8aa2302 100644
--- a/systemd-units/nfs-utils/files/rpc.gssd.service.8
+++ b/systemd-units/nfs-utils/files/rpc.gssd.service.10
@@ -3,6 +3,7 @@ Description=NFS rpcsec_gss daemon
 Requires=var-lib-nfs-rpc_pipefs.mount
 Requires=rpcbind.target
 After=syslog.target var-lib-nfs-rpc_pipefs.mount rpcbind.target
+Before=remote-fs.target
 
 [Service]
 ExecStart=/usr/sbin/rpc.gssd -f

diff --git a/systemd-units/nfs-utils/files/rpc.idmapd.service.8 b/systemd-units/nfs-utils/files/rpc.idmapd.service.10
similarity index 92%
rename from systemd-units/nfs-utils/files/rpc.idmapd.service.8
rename to systemd-units/nfs-utils/files/rpc.idmapd.service.10
index 0020016..1a32860 100644
--- a/systemd-units/nfs-utils/files/rpc.idmapd.service.8
+++ b/systemd-units/nfs-utils/files/rpc.idmapd.service.10
@@ -3,6 +3,7 @@ Description=NFSv4 ID-name mapping daemon
 Wants=var-lib-nfs-rpc_pipefs.mount
 Requires=network.target var-lib-nfs-rpc_pipefs.mount rpcbind.target
 After=syslog.target network.target named.service rpcbind.target
+Before=remote-fs.target
 
 [Service]
 ExecStart=/usr/sbin/rpc.idmapd -f

diff --git a/systemd-units/nfs-utils/files/rpc.statd.service.8 b/systemd-units/nfs-utils/files/rpc.statd.service.10
similarity index 89%
rename from systemd-units/nfs-utils/files/rpc.statd.service.8
rename to systemd-units/nfs-utils/files/rpc.statd.service.10
index 9136413..de07a39 100644
--- a/systemd-units/nfs-utils/files/rpc.statd.service.8
+++ b/systemd-units/nfs-utils/files/rpc.statd.service.10
@@ -2,6 +2,7 @@
 Description=NFS file locking service
 Requires=rpcbind.target
 After=syslog.target network.target rpcbind.target
+Before=remote-fs.target
 
 [Service]
 ExecStart=/sbin/rpc.statd --no-notify -d -F

diff --git a/systemd-units/nfs-utils/files/sm-notify.service.8 b/systemd-units/nfs-utils/files/sm-notify.service.10
similarity index 100%
rename from systemd-units/nfs-utils/files/sm-notify.service.8
rename to systemd-units/nfs-utils/files/sm-notify.service.10

diff --git a/systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.8 b/systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.10
similarity index 100%
rename from systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.8
rename to systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.10

diff --git a/systemd-units/nfs-utils/nfs-utils-10.ebuild b/systemd-units/nfs-utils/nfs-utils-10.ebuild
new file mode 100644
index 0000000..28cc6ac
--- /dev/null
+++ b/systemd-units/nfs-utils/nfs-utils-10.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.10 nfs3-client.target
+	systemd_newunit "${FILESDIR}"/nfs4-client.target.10 nfs4-client.target
+	systemd_newunit "${FILESDIR}"/proc-fs-nfsd.mount.10 proc-fs-nfsd.mount
+	systemd_newunit "${FILESDIR}"/rpc.gssd.service.10 rpc.gssd.service
+	systemd_newunit "${FILESDIR}"/rpc.idmapd.service.10 rpc.idmapd.service
+	systemd_newunit "${FILESDIR}"/rpc.statd.service.10 rpc.statd.service
+	systemd_newunit "${FILESDIR}"/sm-notify.service.10 sm-notify.service
+	systemd_newunit "${FILESDIR}"/var-lib-nfs-rpc_pipefs.mount.10 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
deleted file mode 100644
index 9a795dd..0000000
--- a/systemd-units/nfs-utils/nfs-utils-8.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.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
-}