| 1 |
commit: 17ae35d84179494da590276bdf61784e9226a5d9 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 14 21:43:23 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 14 21:45:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ae35d8 |
| 7 |
|
| 8 |
Revert "sys-fs/zfs: make modprobe optional for systemd unit files" |
| 9 |
|
| 10 |
This reverts commit c756381a157ee8c3de2924685791d962eeb3d341. |
| 11 |
|
| 12 |
sys-fs/zfs/zfs-9999.ebuild | 10 ++++++++++ |
| 13 |
1 file changed, 10 insertions(+) |
| 14 |
|
| 15 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 16 |
index 5cfa93fa4c5..7b8d2f94a45 100644 |
| 17 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 18 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 19 |
@@ -87,6 +87,12 @@ src_prepare() { |
| 20 |
-e "s|/sbin/parted|/usr/sbin/parted|" \ |
| 21 |
-i scripts/common.sh.in |
| 22 |
|
| 23 |
+ if use kernel-builtin |
| 24 |
+ then |
| 25 |
+ einfo "kernel-builtin enabled, removing module loading from" |
| 26 |
+ einfo "systemd units." |
| 27 |
+ sed -i -e '/modprobe\ zfs/d' etc/systemd/system/*.service.in || die |
| 28 |
+ fi |
| 29 |
autotools-utils_src_prepare |
| 30 |
} |
| 31 |
|
| 32 |
@@ -114,6 +120,10 @@ src_configure() { |
| 33 |
sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
| 34 |
-e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
| 35 |
> "${T}/zfs-init.sh" || die |
| 36 |
+ if use kernel-builtin |
| 37 |
+ then |
| 38 |
+ sed -i -e '/modprobe\ zfs/d' "${T}/zfs.service" || die |
| 39 |
+ fi |
| 40 |
} |
| 41 |
|
| 42 |
src_install() { |
Archives