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 19A091382C5 for ; Sun, 20 Jun 2021 17:18:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48517E0849; Sun, 20 Jun 2021 17:18:55 +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 2B757E0849 for ; Sun, 20 Jun 2021 17:18:55 +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 082BB335CDF for ; Sun, 20 Jun 2021 17:18:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFAD678E for ; Sun, 20 Jun 2021 17:18:52 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1624209527.7882a746a7db7bfd78784716746104e1ebd2454b.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7882a746a7db7bfd78784716746104e1ebd2454b X-VCS-Branch: master Date: Sun, 20 Jun 2021 17:18:52 +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: 76354210-972b-4cc5-a95a-9f1696bb98f2 X-Archives-Hash: ebde9305d84be0698762202327f1b168 commit: 7882a746a7db7bfd78784716746104e1ebd2454b Author: Mike Gilbert gentoo org> AuthorDate: Sun Jun 20 16:05:43 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Jun 20 17:18:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7882a746 sys-apps/systemd: remove code to save/restore enabled units This was really only needed for a rootprefix transition. Everybody should have been migrated by now. Signed-off-by: Mike Gilbert gentoo.org> sys-apps/systemd/systemd-9999.ebuild | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6c3c1ef813c..8dd85417f98 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -437,19 +437,7 @@ migrate_locale() { fi } -save_enabled_units() { - ENABLED_UNITS=() - type systemctl &>/dev/null || return - for x; do - if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then - ENABLED_UNITS+=( "${x}" ) - fi - done -} - pkg_preinst() { - save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service - if ! use split-usr; then local dir for dir in bin sbin lib; do @@ -478,16 +466,10 @@ pkg_postinst() { udev_reload || FAIL=1 - # Bug 465468, make sure locales are respect, and ensure consistency + # Bug 465468, make sure locales are respected, and ensure consistency # between OpenRC & systemd migrate_locale - systemd_reenable systemd-networkd.service systemd-resolved.service - - if [[ ${ENABLED_UNITS[@]} ]]; then - systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}" - fi - if [[ -z ${REPLACING_VERSIONS} ]]; then if type systemctl &>/dev/null; then systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1