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 5cfa93fa4c5072f5bd0301b48511476ba02f0302..7b8d2f94a45cb0d7baa0ff64d9c21b4fd49305a0 100644 (file)
--- 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() {