diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-08-18 15:17:05 -0700 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2019-08-18 17:43:55 -0700 |
| commit | fc7e33f098e7ca0cf0e851eded81bc6da95c56c6 (patch) | |
| tree | a9a3568ab76d2aa0591a90bd3cbd3858de467bc4 | |
| parent | net-misc/whois: Synced live ebuild (diff) | |
| download | gentoo-fc7e33f0.tar.gz gentoo-fc7e33f0.tar.bz2 gentoo-fc7e33f0.zip | |
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@gentoo.org>
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 267450980af8..4c9ec8687286 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() { |