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 5C8C713832E for ; Sat, 30 Jul 2016 15:46:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9AF721C06C; Sat, 30 Jul 2016 15:46:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A92321C06C for ; Sat, 30 Jul 2016 15:46:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4322B340D00 for ; Sat, 30 Jul 2016 15:46:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91EE2E6B for ; Sat, 30 Jul 2016 15:46:42 +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: <1469893594.273a0ad4f4a13298749dc9584c38ee97a556f8a1.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: 273a0ad4f4a13298749dc9584c38ee97a556f8a1 X-VCS-Branch: master Date: Sat, 30 Jul 2016 15:46:42 +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-Archives-Salt: de752de2-2da4-4b8b-966b-563a3fbf7403 X-Archives-Hash: cc2e15ce4ddf68a3161eea9232006294 commit: 273a0ad4f4a13298749dc9584c38ee97a556f8a1 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 30 14:54:39 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 30 15:46:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273a0ad4 sys-apps/systemd: drop reenable_unit sys-apps/systemd/systemd-9999.ebuild | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index a6151d1..3256156 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -400,14 +400,6 @@ migrate_locale() { fi } -reenable_unit() { - if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then - ebegin "Re-enabling $1" - systemctl reenable --root="${ROOT}" "$1" - eend $? || FAIL=1 - fi -} - pkg_postinst() { newusergroup() { enewgroup "$1" @@ -439,9 +431,6 @@ pkg_postinst() { # between OpenRC & systemd migrate_locale - # Re-enable systemd-networkd for socket activation - reenable_unit systemd-networkd.service - if [[ ${FAIL} ]]; then eerror "One of the postinst commands failed. Please check the postinst output" eerror "for errors. You may need to clean up your system and/or try installing"