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 A14B31382C5 for ; Sun, 31 Jan 2021 21:36:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02240E0880; Sun, 31 Jan 2021 21:35:53 +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 DEF5CE0880 for ; Sun, 31 Jan 2021 21:35:52 +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 1CF98340E94 for ; Sun, 31 Jan 2021 21:35:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ADE0476 for ; Sun, 31 Jan 2021 21:35:49 +0000 (UTC) From: "Piotr Karbowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Piotr Karbowski" Message-ID: <1612128940.1489fb9dc4df8c340aeacbb95b913965cb9c1816.slashbeast@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/display-manager-init/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-libs/display-manager-init/display-manager-init-1.0.ebuild X-VCS-Directories: gui-libs/display-manager-init/ X-VCS-Committer: slashbeast X-VCS-Committer-Name: Piotr Karbowski X-VCS-Revision: 1489fb9dc4df8c340aeacbb95b913965cb9c1816 X-VCS-Branch: master Date: Sun, 31 Jan 2021 21:35:49 +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: 37694a76-4b95-4eb3-9e13-15ea5f53b4cc X-Archives-Hash: 05ebe1ae9288fd74afb7c9c5e2eb5626 commit: 1489fb9dc4df8c340aeacbb95b913965cb9c1816 Author: Aisha Tammy aisha cc> AuthorDate: Sun Jan 31 14:17:32 2021 +0000 Commit: Piotr Karbowski gentoo org> CommitDate: Sun Jan 31 21:35:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1489fb9d gui-libs/display-manager-init: add postinst warning Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> Closes: https://github.com/gentoo/gentoo/pull/19272 Signed-off-by: Piotr Karbowski gentoo.org> .../display-manager-init/display-manager-init-1.0.ebuild | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild index 576a0a7c887..586c5ddc0f5 100644 --- a/gui-libs/display-manager-init/display-manager-init-1.0.ebuild +++ b/gui-libs/display-manager-init/display-manager-init-1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,4 +34,18 @@ pkg_preinst() { if [[ ${REPLACING_VERSIONS} == "" && -f "${EROOT}"/etc/conf.d/xdm && ! -f "${EROOT}"/etc/conf.d/display-manager ]]; then mv "${EROOT}"/etc/conf.d/{xdm,display-manager} || die fi + local rlevel using_xdm + using_xdm=no + for rlevel in boot default sysinit; do + if [[ -e "${EROOT}"/etc/runlevels/${rlevel}/xdm ]]; then + using_xdm=yes + fi + done + if [[ "${using_xdm}" = "yes" ]]; then + ewarn "The 'xdm' service has been removed as it is" + ewarn "being replaced by the 'display-manager' service." + ewarn "Please migrate to using 'display-manager' and" + ewarn "remember to use dispatch-conf to update the" + ewarn "config protected service files." + fi }