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 3BDE213835A for ; Mon, 28 Sep 2020 10:11:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36ECAE084E; Mon, 28 Sep 2020 10:10:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1D537E084E for ; Mon, 28 Sep 2020 10:10:59 +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 E6C1B340817 for ; Mon, 28 Sep 2020 10:10:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DF23373 for ; Mon, 28 Sep 2020 10:10:56 +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: <1601287845.762b42a20c94ac2abae87cbb4003f32a777b8322.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-auto-snapshot/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild X-VCS-Directories: sys-fs/zfs-auto-snapshot/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 762b42a20c94ac2abae87cbb4003f32a777b8322 X-VCS-Branch: master Date: Mon, 28 Sep 2020 10:10:56 +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: 842021b5-5656-4b90-aaf5-96f802465d55 X-Archives-Hash: b356dad0194e35dd621299876ab43e8c commit: 762b42a20c94ac2abae87cbb4003f32a777b8322 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Sep 28 10:10:45 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Sep 28 10:10:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762b42a2 sys-fs/zfs-auto-snapshot: sync live ebuild Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> .../zfs-auto-snapshot-9999.ebuild | 50 +++++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild index c880e32a760..b17e57c0c4e 100644 --- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild +++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit readme.gentoo-r1 +inherit prefix readme.gentoo-r1 systemd if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -20,10 +20,14 @@ HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot" LICENSE="GPL-2+" SLOT="0" -IUSE="+default-exclude" +IUSE="+cron +default-exclude systemd" -RDEPEND="sys-fs/zfs - virtual/cron" +RDEPEND=" + sys-fs/zfs + !systemd? ( virtual/cron ) +" + +REQUIRED_USE="!systemd? ( cron )" src_install() { if use default-exclude; then @@ -34,6 +38,27 @@ src_install() { fi readme.gentoo_create_doc emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install + + local exclude unit + exclude="$(usev default-exclude)" + for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.service; do + cp "${FILESDIR}/${unit}" "${T}/${unit}" || die + eprefixify "${T}/${unit}" + sed -i "s/@DEFAULT_EXCLUDE@/${exclude:+--default-exclude}/g" "${T}/${unit}" || die + systemd_dounit "${T}/${unit}" + done + for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.timer; do + systemd_dounit "${FILESDIR}/${unit}" + done + systemd_dounit "${FILESDIR}/${PN}.target" + + if ! use cron; then + ebegin "removing cron files from installation image" + rm -rfv "${ED}/etc" || die + eend "$?" + fi + + pkg_postinst } pkg_postinst() { @@ -45,8 +70,21 @@ pkg_postinst() { elog fi - if has_version sys-process/fcron; then + if use cron && has_version sys-process/fcron; then ewarn "frequent snapshot may not work if you are using fcron" ewarn "you should add frequent job to crontab manually" fi + + if use cron; then + if systemd_is_booted || has_version sys-apps/systemd; then + echo + ewarn "Both 'cron' and 'systemd' flags are enabled." + ewarn "So both ${PN}.target and cron files were installed." + ewarn "Please don't use 2 implementations at the same time." + ewarn "Cronjobs are usually enabled by default via /etc/cron.* jobs" + ewarn "If you want to use systemd ${PN}.target timers" + ewarn "disable 'cron' flag and reinstall ${PN}" + echo + fi + fi }