sys-fs/zfs: update live ebuild
authorGeorgy Yakovlev <gyakovlev@gentoo.org>
Sun, 18 Aug 2019 22:17:05 +0000 (15:17 -0700)
committerGeorgy Yakovlev <gyakovlev@gentoo.org>
Mon, 19 Aug 2019 00:43:55 +0000 (17:43 -0700)
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@gentoo.org>
sys-fs/zfs/zfs-9999.ebuild

index 267450980af85c62e14039df3bc1578a548efee7..4c9ec8687286af712461267ef4edc7d08a169c3d 100644 (file)
@@ -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() {