| 1 |
commit: c756381a157ee8c3de2924685791d962eeb3d341 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 14 20:38:27 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 14 20:39:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c756381a |
| 7 |
|
| 8 |
sys-fs/zfs: make modprobe optional for systemd unit files |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-fs/zfs/files/zfs.service.in | 2 +- |
| 13 |
sys-fs/zfs/zfs-9999.ebuild | 10 ---------- |
| 14 |
2 files changed, 1 insertion(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in |
| 17 |
index c390a480708..ae2eff170a7 100644 |
| 18 |
--- a/sys-fs/zfs/files/zfs.service.in |
| 19 |
+++ b/sys-fs/zfs/files/zfs.service.in |
| 20 |
@@ -6,7 +6,7 @@ After=systemd-udev-settle.target local-fs.target |
| 21 |
[Service] |
| 22 |
Type=oneshot |
| 23 |
RemainAfterExit=yes |
| 24 |
-ExecStartPre=/sbin/modprobe zfs |
| 25 |
+ExecStartPre=-/sbin/modprobe zfs |
| 26 |
ExecStartPre=/usr/bin/test -c /dev/zfs |
| 27 |
ExecStart=/usr/libexec/zfs-init.sh |
| 28 |
ExecStop=@sbindir@/zfs umount -a |
| 29 |
|
| 30 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 31 |
index 7b8d2f94a45..5cfa93fa4c5 100644 |
| 32 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 33 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 34 |
@@ -87,12 +87,6 @@ src_prepare() { |
| 35 |
-e "s|/sbin/parted|/usr/sbin/parted|" \ |
| 36 |
-i scripts/common.sh.in |
| 37 |
|
| 38 |
- if use kernel-builtin |
| 39 |
- then |
| 40 |
- einfo "kernel-builtin enabled, removing module loading from" |
| 41 |
- einfo "systemd units." |
| 42 |
- sed -i -e '/modprobe\ zfs/d' etc/systemd/system/*.service.in || die |
| 43 |
- fi |
| 44 |
autotools-utils_src_prepare |
| 45 |
} |
| 46 |
|
| 47 |
@@ -120,10 +114,6 @@ src_configure() { |
| 48 |
sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ |
| 49 |
-e "s:@sysconfdir@:${EPREFIX}/etc:g" \ |
| 50 |
> "${T}/zfs-init.sh" || die |
| 51 |
- if use kernel-builtin |
| 52 |
- then |
| 53 |
- sed -i -e '/modprobe\ zfs/d' "${T}/zfs.service" || die |
| 54 |
- fi |
| 55 |
} |
| 56 |
|
| 57 |
src_install() { |
Archives