From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 854EE139694 for ; Wed, 14 Jun 2017 21:32:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C97E821C09F; Wed, 14 Jun 2017 21:32:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A909421C09F for ; Wed, 14 Jun 2017 21:32:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 624F8341816 for ; Wed, 14 Jun 2017 21:32:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0B057465 for ; Wed, 14 Jun 2017 21:32:13 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1497475927.3548c205ad5b869ffbd66b997eeb3e19565e3933.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild X-VCS-Directories: net-fs/nfs-utils/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3548c205ad5b869ffbd66b997eeb3e19565e3933 X-VCS-Branch: master Date: Wed, 14 Jun 2017 21:32:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 264b37b0-91e2-4302-954c-68fc6a676a11 X-Archives-Hash: 671401b314447fb5bb212c875b8a27e8 commit: 3548c205ad5b869ffbd66b997eeb3e19565e3933 Author: Lars Wendler gentoo org> AuthorDate: Wed Jun 14 20:40:39 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jun 14 21:32:07 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3548c205 net-fs/nfs-utils: Backported some changes. Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild index 79d5d3997a9..ab79aa46f8e 100644 --- a/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild @@ -147,6 +147,9 @@ src_install() { -e '/^(After|Wants)=nfs-config.service$/d' \ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ "${D}$(systemd_get_unitdir)"/* || die + + keepdir /var/lib/nfs #368505 + keepdir /var/lib/nfs/v4recovery #603628 } pkg_postinst() { @@ -154,7 +157,6 @@ pkg_postinst() { # src_install we put them in /usr/lib/nfs for safe-keeping, but # the daemons actually use the files in /var/lib/nfs. #30486 local f - mkdir -p "${EROOT}"/var/lib/nfs #368505 for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"