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 D837E138334 for ; Sun, 18 Aug 2019 01:19:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BC54E08E0; Sun, 18 Aug 2019 01:19:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 62A41E08DB for ; Sun, 18 Aug 2019 01:19:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D2466349D8F for ; Sun, 18 Aug 2019 01:19:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55640762 for ; Sun, 18 Aug 2019 01:19:28 +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: <1566090250.17b9ca6a5d3e11ddc9ba372f9d50104d7a6a5a71.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: 17b9ca6a5d3e11ddc9ba372f9d50104d7a6a5a71 X-VCS-Branch: master Date: Sun, 18 Aug 2019 01:19:28 +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: d509c86d-8bb5-4640-8de8-7b1192b33e6b X-Archives-Hash: 772a6f11dc5d3c20b2f833250ffb46d0 commit: 17b9ca6a5d3e11ddc9ba372f9d50104d7a6a5a71 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Aug 18 00:19:26 2019 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Aug 18 01:04:10 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b9ca6a sys-fs/zfs: update live ebuild remove *.la files if no static-libs requested clarify genkernel encryption support with genkernel-4 remove obsolete zfs initscript checks, those were here since cvs times. Those initscripts long gone and systems already migrated to new scripts. remove obsolete systemd-reenable calls, those were needed with earlier versions incorrectly installing systemd units to wrong location. it has been more than a year since those versions are gone. Bug: https://bugs.gentoo.org/647688 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs/zfs-9999.ebuild | 73 ++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 55 deletions(-) diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index b0b23dadff9..df1803820df 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -119,6 +119,11 @@ src_prepare() { 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 } src_configure() { @@ -162,6 +167,10 @@ src_install() { use test-suite || rm -rf "${ED}/usr/share/zfs" + if ! use static-libs; then + find "${ED}/" -name '*.la' -delete || die + fi + dobashcomp contrib/bash_completion.d/zfs bashcomp_alias zfs zpool @@ -183,7 +192,7 @@ pkg_postinst() { if has_version "<=sys-kernel/genkernel-3.5.3.3"; then einfo "genkernel version 3.5.3.3 and earlier does NOT support" einfo " unlocking pools with native zfs encryption enabled at boot" - einfo " use dracut or genkernel-9999 if you requre this functionality" + einfo " use dracut or >=genkernel-4.0.0 if you requre this functionality" fi if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then @@ -192,60 +201,14 @@ pkg_postinst() { update_moduledb fi - if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}/etc/runlevels/boot/zfs" - ln -snf "${EROOT}/etc/init.d/zfs-import" \ - "${EROOT}/etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}/etc/init.d/zfs-mount" \ - "${EROOT}/etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}/etc/init.d/zfs-share" \ - "${EROOT}/etc/runlevels/default/zfs-share" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}/etc/runlevels/boot/zed" - ln -snf "${EROOT}/etc/init.d/zfs-zed" \ - "${EROOT}/etc/runlevels/default/zfs-zed" - else - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" - fi - - systemd_reenable zfs-zed.service - systemd_reenable zfs-import-cache.service - systemd_reenable zfs-import-scan.service - systemd_reenable zfs-mount.service - systemd_reenable zfs-share.service - systemd_reenable zfs-import.target - systemd_reenable zfs.target + [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ + einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ + einfo "You should add zfs-mount to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ + einfo "You should add zfs-share to the default runlevel." + [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ + einfo "You should add zfs-zed to the default runlevel." } pkg_postrm() {