[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/

[Matt Thode]

commit:     af64983b269425c0cfd6d71262ac736ab297ba6e
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 01:55:12 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat May  7 01:55:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af64983b

sys-fs/zfs: fix systemd units for kernel-builtin

Package-Manager: portage-2.2.26

 sys-fs/zfs/zfs-9999.ebuild | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 11f0637..6f514eb 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -88,6 +88,12 @@ src_prepare() {
                -e "s|/sbin/parted|/usr/sbin/parted|" \
                -i scripts/common.sh.in
 
+       if use kernel-builtin
+       then
+               einfo "kernel-builtin enabled, removing module loading from"
+               einfo "systemd units."
+               sed -i -e '/modprobe\ zfs/d' etc/systemd/system/*.service.in || 
die
+       fi
        autotools-utils_src_prepare
 }
 
@@ -115,6 +121,10 @@ src_configure() {
                sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
                        -e "s:@sysconfdir@:${EPREFIX}/etc:g" \
                > "${T}/zfs-init.sh" || die
+       if use kernel-builtin
+       then
+               sed -i -e '/modprobe\ zfs/d' "${T}/zfs.service" || die
+       fi
 }
 
 src_install() {