summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2016-05-06 20:55:12 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2016-05-06 20:55:12 -0500
commitaf64983b269425c0cfd6d71262ac736ab297ba6e (patch)
tree8191a517abdb48edfb3884b326f9b4eedd690be5
parentgames-arcade/ceferino: use Debian tarball which include upstream svn changes.... (diff)
downloadgentoo-af64983b269425c0cfd6d71262ac736ab297ba6e.tar.gz
gentoo-af64983b269425c0cfd6d71262ac736ab297ba6e.tar.bz2
gentoo-af64983b269425c0cfd6d71262ac736ab297ba6e.zip
sys-fs/zfs: fix systemd units for kernel-builtin
Package-Manager: portage-2.2.26
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild10
1 files changed, 10 insertions, 0 deletions
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() {