Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/
Date: Mon, 19 Aug 2019 00:45:30
Message-Id: 1566175435.fc7e33f098e7ca0cf0e851eded81bc6da95c56c6.gyakovlev@gentoo
1 commit: fc7e33f098e7ca0cf0e851eded81bc6da95c56c6
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 18 22:17:05 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 19 00:43:55 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7e33f0
7
8 sys-fs/zfs: update live ebuild
9
10 remove useless sed, thanks @floppym for pointing out
11 always set ZFS_UNMOUNT='no' in confd, openrc will handle unmounts on it's own.
12
13 Package-Manager: Portage-2.3.71, Repoman-2.3.17
14 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
15
16 sys-fs/zfs/zfs-9999.ebuild | 13 +++----------
17 1 file changed, 3 insertions(+), 10 deletions(-)
18
19 diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
20 index 267450980af..4c9ec868728 100644
21 --- a/sys-fs/zfs/zfs-9999.ebuild
22 +++ b/sys-fs/zfs/zfs-9999.ebuild
23 @@ -108,22 +108,15 @@ src_prepare() {
24 sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
25 fi
26
27 - # Update paths
28 - sed -e "s|/sbin/lsmod|/bin/lsmod|" \
29 - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
30 - -e "s|/sbin/parted|/usr/sbin/parted|" \
31 - -i scripts/common.sh.in || die
32 -
33 if use python; then
34 pushd contrib/pyzfs >/dev/null || die
35 distutils-r1_src_prepare
36 popd >/dev/null || die
37 fi
38
39 - # prevent errors showing up on zfs-mount stop, openrc will unmount all filesystems anyway
40 - if use rootfs; then
41 - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
42 - fi
43 + # prevent errors showing up on zfs-mount stop, #647688
44 + # openrc will unmount all filesystems anyway.
45 + sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
46 }
47
48 src_configure() {