summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-06-24 22:54:16 +0000
committerMike Frysinger <vapier@gentoo.org>2014-06-24 22:54:16 +0000
commitd37215ff925c841cb2a78db6ecae7a5db0a7223e (patch)
treebb9727bde0c3bd0d1591bb078d4d08c562a2f143 /net-fs/nfs-utils
parentLower dev-libs/glib dep to first known EAPI=5 version, requested by Funtoo fo... (diff)
downloadgentoo-2-d37215ff925c841cb2a78db6ecae7a5db0a7223e.tar.gz
gentoo-2-d37215ff925c841cb2a78db6ecae7a5db0a7223e.tar.bz2
gentoo-2-d37215ff925c841cb2a78db6ecae7a5db0a7223e.zip
Hack up the systemd scripts a bit more #514372 by Juergen Rose.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-fs/nfs-utils')
-rw-r--r--net-fs/nfs-utils/ChangeLog5
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.3.0.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index e9fb5fbb3dc1..4d4b2d42b65d 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/nfs-utils
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.247 2014/06/20 06:24:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.248 2014/06/24 22:54:16 vapier Exp $
+
+ 24 Jun 2014; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.3.0.ebuild:
+ Hack up the systemd scripts a bit more #514372 by Juergen Rose.
*nfs-utils-1.3.0 (20 Jun 2014)
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
index 836d676ade2c..ba5d0f29599d 100644
--- a/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.1 2014/06/20 06:24:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.3.0.ebuild,v 1.2 2014/06/24 22:54:16 vapier Exp $
EAPI="4"
@@ -134,8 +134,11 @@ src_install() {
if ! use nfsv4 || ! use kerberos ; then
rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
fi
- sed -i \
+ rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
+ sed -i -r \
-e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
+ -e '/^(After|Wants)=nfs-config.service$/d' \
+ -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
"${D}$(systemd_get_unitdir)"/* || die
}