sys-fs/zfs: make modprobe optional for systemd unit files

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in
index c390a480708e754b525893014f7e528387934693..ae2eff170a72c1aacc1ecf27448fdb9b6e968e4a 100644 (file)
--- a/sys-fs/zfs/files/zfs.service.in
+++ b/sys-fs/zfs/files/zfs.service.in
@@ -6,7 +6,7 @@ After=systemd-udev-settle.target local-fs.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStartPre=/sbin/modprobe zfs
+ExecStartPre=-/sbin/modprobe zfs
 ExecStartPre=/usr/bin/test -c /dev/zfs
 ExecStart=/usr/libexec/zfs-init.sh
 ExecStop=@sbindir@/zfs umount -a

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 7b8d2f94a45cb0d7baa0ff64d9c21b4fd49305a0..5cfa93fa4c5072f5bd0301b48511476ba02f0302 100644 (file)
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -87,12 +87,6 @@ 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
 }
 
@@ -120,10 +114,6 @@ 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() {