From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ReOsn-0001qm-54 for garchives@archives.gentoo.org; Sat, 24 Dec 2011 10:31:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5800D21C11C; Sat, 24 Dec 2011 10:31:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1842921C11C for ; Sat, 24 Dec 2011 10:31:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 788861B4047 for ; Sat, 24 Dec 2011 10:31:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9782380042 for ; Sat, 24 Dec 2011 10:31:08 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] dev/mgorny:master commit in: systemd-units/nfs-utils/files/, systemd-units/nfs-utils/ X-VCS-Repository: dev/mgorny X-VCS-Files: systemd-units/nfs-utils/files/nfs3-client.target.10 systemd-units/nfs-utils/files/nfs3-client.target.8 systemd-units/nfs-utils/files/nfs4-client.target.10 systemd-units/nfs-utils/files/nfs4-client.target.8 systemd-units/nfs-utils/files/proc-fs-nfsd.mount.10 systemd-units/nfs-utils/files/proc-fs-nfsd.mount.8 systemd-units/nfs-utils/files/rpc.gssd.service.10 systemd-units/nfs-utils/files/rpc.gssd.service.8 systemd-units/nfs-utils/files/rpc.idmapd.service.10 systemd-units/nfs-utils/files/rpc.idmapd.service.8 systemd-units/nfs-utils/files/rpc.statd.service.10 systemd-units/nfs-utils/files/rpc.statd.service.8 systemd-units/nfs-utils/files/sm-notify.service.10 systemd-units/nfs-utils/files/sm-notify.service.8 systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.10 systemd-units/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount.8 systemd-units/nfs-utils/nfs-utils-10.ebuild systemd-units/nfs-utils/nfs-utils-8.ebuild X-VCS-Directories: systemd-units/nfs-utils/files/ systemd-units/nfs-utils/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e4f6cf5ef2722e34bc96309a109f5a277ccf86d4 Date: Sat, 24 Dec 2011 10:31:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d31c3e94-e8e6-4333-897f-46b6814e2fa4 X-Archives-Hash: fc6444fc863568c0420c42d3c5ecbdd7 commit: e4f6cf5ef2722e34bc96309a109f5a277ccf86d4 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun Dec 18 21:06:03 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun Dec 18 21:06:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3De4f6cf5e Sync systemd unit ebuilds. --- ...{nfs3-client.target.8 =3D> nfs3-client.target.10} | 2 +- ...{nfs4-client.target.8 =3D> nfs4-client.target.10} | 7 +++-- ...{proc-fs-nfsd.mount.8 =3D> proc-fs-nfsd.mount.10} | 0 .../{rpc.gssd.service.8 =3D> rpc.gssd.service.10} | 1 + ...{rpc.idmapd.service.8 =3D> rpc.idmapd.service.10} | 1 + .../{rpc.statd.service.8 =3D> rpc.statd.service.10} | 1 + .../{sm-notify.service.8 =3D> sm-notify.service.10} | 0 ...efs.mount.8 =3D> 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=3DDependencies for NFSv3 mounts -Requires=3Drpc.statd.service +BindTo=3Drpc.statd.service Wants=3Dsm-notify.service After=3Drpc.statd.service Before=3Dremote-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=3DDependencies for NFSv4 mounts -Requires=3Drpc.idmapd.service -Requires=3Drpc.statd.service +BindTo=3Drpc.idmapd.service +BindTo=3Drpc.statd.service Wants=3Dsm-notify.service -Wants=3Drpc.gssd.service +# rpc.gssd is not obligatory only when not using encryption +#Wants=3Drpc.gssd.service After=3Drpc.idmapd.service rpc.statd.service rpc.gssd.service Before=3Dremote-fs.target =20 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-u= nits/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=3DNFS rpcsec_gss daemon Requires=3Dvar-lib-nfs-rpc_pipefs.mount Requires=3Drpcbind.target After=3Dsyslog.target var-lib-nfs-rpc_pipefs.mount rpcbind.target +Before=3Dremote-fs.target =20 [Service] ExecStart=3D/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=3DNFSv4 ID-name mapping daemon Wants=3Dvar-lib-nfs-rpc_pipefs.mount Requires=3Dnetwork.target var-lib-nfs-rpc_pipefs.mount rpcbind.target After=3Dsyslog.target network.target named.service rpcbind.target +Before=3Dremote-fs.target =20 [Service] ExecStart=3D/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=3DNFS file locking service Requires=3Drpcbind.target After=3Dsyslog.target network.target rpcbind.target +Before=3Dremote-fs.target =20 [Service] ExecStart=3D/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=3D4 + +inherit systemd + +DESCRIPTION=3D"Systemd units for net-fs/nfs-utils" +HOMEPAGE=3D"" +SRC_URI=3D"" + +LICENSE=3D"as-is" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"" + +S=3D${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-n= fs-rpc_pipefs.mount +} diff --git a/systemd-units/nfs-utils/nfs-utils-8.ebuild b/systemd-units/n= fs-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=3D4 - -inherit systemd - -DESCRIPTION=3D"Systemd units for net-fs/nfs-utils" -HOMEPAGE=3D"" -SRC_URI=3D"" - -LICENSE=3D"as-is" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"" - -S=3D${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-nf= s-rpc_pipefs.mount -}