From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F3667138334 for ; Mon, 19 Aug 2019 00:45:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD816E089A; Mon, 19 Aug 2019 00:45:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF18BE089A for ; Mon, 19 Aug 2019 00:45:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C9DE349DD4 for ; Mon, 19 Aug 2019 00:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C727862A for ; Mon, 19 Aug 2019 00:45:25 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1566175435.fc7e33f098e7ca0cf0e851eded81bc6da95c56c6.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: fc7e33f098e7ca0cf0e851eded81bc6da95c56c6 X-VCS-Branch: master Date: Mon, 19 Aug 2019 00:45:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4ae3fd6c-006a-4144-b2b1-81be3b245ec6 X-Archives-Hash: 863548a7e1615528a7cdc27a4186f512 commit: fc7e33f098e7ca0cf0e851eded81bc6da95c56c6 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Aug 18 22:17:05 2019 +0000 Commit: Georgy Yakovlev gentoo 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 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() {