From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 362D01382C5 for ; Wed, 14 Feb 2018 21:45:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5914EE0931; Wed, 14 Feb 2018 21:45:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 369FCE0931 for ; Wed, 14 Feb 2018 21:45:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE3E5335C09 for ; Wed, 14 Feb 2018 21:45:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B89AC1E0 for ; Wed, 14 Feb 2018 21:45:15 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1518644706.17ae35d84179494da590276bdf61784e9226a5d9.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 17ae35d84179494da590276bdf61784e9226a5d9 X-VCS-Branch: master Date: Wed, 14 Feb 2018 21:45:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7be947c5-0637-4a7b-b2d0-08871a1de350 X-Archives-Hash: 90e39f1fb98991c1c84598e446a555ff commit: 17ae35d84179494da590276bdf61784e9226a5d9 Author: Matthew Thode gentoo org> AuthorDate: Wed Feb 14 21:43:23 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Wed Feb 14 21:45:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ae35d8 Revert "sys-fs/zfs: make modprobe optional for systemd unit files" This reverts commit c756381a157ee8c3de2924685791d962eeb3d341. 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 5cfa93fa4c5..7b8d2f94a45 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() {