[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/

[Georgy Yakovlev]

commit:     fc7e33f098e7ca0cf0e851eded81bc6da95c56c6
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 22:17:05 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 00:43:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7e33f0

sys-fs/zfs: update live ebuild

remove useless sed, thanks @floppym for pointing out
always set ZFS_UNMOUNT='no' in confd, openrc will handle unmounts on it's own.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs/zfs-9999.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 267450980af..4c9ec868728 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -108,22 +108,15 @@ src_prepare() {
                sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die 
"Could not set Gentoo release"
        fi
 
-       # Update paths
-       sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-               -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-               -e "s|/sbin/parted|/usr/sbin/parted|" \
-               -i scripts/common.sh.in || die
-
        if use python; then
                pushd contrib/pyzfs >/dev/null || die
                distutils-r1_src_prepare
                popd >/dev/null || die
        fi
 
-       # prevent errors showing up on zfs-mount stop, openrc will unmount all 
filesystems anyway
-       if use rootfs; then
-               sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
-       fi
+       # prevent errors showing up on zfs-mount stop, #647688
+       # openrc will unmount all filesystems anyway.
+       sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
 }
 
 src_configure() {