From af64983b269425c0cfd6d71262ac736ab297ba6e Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 6 May 2016 20:55:12 -0500 Subject: [PATCH] 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 11f063745105..6f514eb5d1c4 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() { -- 2.26.2