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 BBB06158092 for ; Mon, 13 Sep 2021 10:35:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4F85E0829; Mon, 13 Sep 2021 10:35:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEB04E0829 for ; Mon, 13 Sep 2021 10:35:00 +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 83010342C7F for ; Mon, 13 Sep 2021 10:34:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEFD0BE for ; Mon, 13 Sep 2021 10:34:57 +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: <1631529262.e5c878662182c4bd4de1a090dd0ae8166b483919.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/etckeeper/, sys-apps/etckeeper/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild sys-apps/etckeeper/etckeeper-1.18.16.ebuild sys-apps/etckeeper/files/etckeeper-conf-update-hook X-VCS-Directories: sys-apps/etckeeper/files/ sys-apps/etckeeper/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: e5c878662182c4bd4de1a090dd0ae8166b483919 X-VCS-Branch: master Date: Mon, 13 Sep 2021 10:34:57 +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: d119474d-4b56-4d5b-babd-97eba48258bf X-Archives-Hash: 8a7933ae4c35029c534e217365c69d31 commit: e5c878662182c4bd4de1a090dd0ae8166b483919 Author: Florian Schmaus gentoo org> AuthorDate: Mon Aug 23 07:15:29 2021 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Sep 13 10:34:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c87866 sys-apps/etckeeper: install conf-update.d hook In newer versions of portage (> 3.0.22), dispatch-conf will invoke hooks found in /etc/portage/update-conf.d. See also portage commit 6e86186244d0 ("dispatch-conf: Add support for conf-update.d hook directory") [1]. 1: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6e86186244d048e3edd5c11c18cfb4eee98a0d56 Signed-off-by: Florian Schmaus gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22075 Signed-off-by: Georgy Yakovlev gentoo.org> ...-1.18.16.ebuild => etckeeper-1.18.16-r1.ebuild} | 5 ++++ .../etckeeper/files/etckeeper-conf-update-hook | 32 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/sys-apps/etckeeper/etckeeper-1.18.16.ebuild b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild similarity index 91% rename from sys-apps/etckeeper/etckeeper-1.18.16.ebuild rename to sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild index 7338b278ab3..0591f38928e 100644 --- a/sys-apps/etckeeper/etckeeper-1.18.16.ebuild +++ b/sys-apps/etckeeper/etckeeper-1.18.16-r1.ebuild @@ -71,6 +71,11 @@ if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then fi _EOF_ fi + + local conf_update_dir="/etc/portage/conf-update.d" + insinto "${conf_update_dir}" + newins "${FILESDIR}/${PN}-conf-update-hook" "${PN}" + fperms 755 "${conf_update_dir}/${PN}" } pkg_postinst() { diff --git a/sys-apps/etckeeper/files/etckeeper-conf-update-hook b/sys-apps/etckeeper/files/etckeeper-conf-update-hook new file mode 100644 index 00000000000..d0546c8776d --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-conf-update-hook @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -eu + +# etckeeper hook for portage's conf-update hooks (e.g. invoked by +# dispatch-conf). Requires portage > 3.0.22. + +# Do nothing if etckeeper is not initialized. +if [[ ! -f "/etc/etckeeper/etckeeper.conf" ]]; then + exit +fi + +echo "conf-update.d ${@}" + +case "${1}" in + pre-session) + echo "Commiting uncommited changes before starting a configuration update session" + etckeeper pre-install + ;; + post-session) + echo "Commiting uncommited changes before after finishing a configuration update session" + etckeeper post-install + ;; + post-update) + ACTION=${1} + FILE_PATH=${2} + FILE=$(basename "${FILE_PATH}") + + echo "Commiting changes for ${FILE}" + etckeeper vcs add "${FILE_PATH}" + etckeeper vcs commit -m "${FILE}: ${ACTION} (conf-update.d hook)" + ;; +esac