From: Matthew Thode <prometheanfire@gentoo.org>
Date: Wed, 14 Feb 2018 21:43:23 +0000 (-0600)
Subject: Revert "sys-fs/zfs: make modprobe optional for systemd unit files"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=17ae35d84179494da590276bdf61784e9226a5d9;p=gentoo.git

Revert "sys-fs/zfs: make modprobe optional for systemd unit files"

This reverts commit c756381a157ee8c3de2924685791d962eeb3d341.
---

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 5cfa93fa4c50..7b8d2f94a45c 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -87,6 +87,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
 }
 
@@ -114,6 +120,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() {