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 A527C138334 for ; Mon, 25 Jun 2018 21:14:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5904DE09E7; Mon, 25 Jun 2018 21:14:45 +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 2FB5DE09E7 for ; Mon, 25 Jun 2018 21:14:44 +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 AD38B335CA7 for ; Mon, 25 Jun 2018 21:14:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 142AC2B0 for ; Mon, 25 Jun 2018 21:14: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: <1529961277.840aa1653307566107f0ef2f50f894d2a863891e.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-239.ebuild 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: 840aa1653307566107f0ef2f50f894d2a863891e X-VCS-Branch: master Date: Mon, 25 Jun 2018 21:14: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: 690a85de-4b5b-4096-a1d9-3be0f4158bad X-Archives-Hash: 79805f1fdbcbc3a66ff81597e55507d4 commit: 840aa1653307566107f0ef2f50f894d2a863891e Author: Mike Gilbert gentoo org> AuthorDate: Mon Jun 25 21:14:22 2018 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jun 25 21:14:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840aa165 sys-apps/systemd: fix install logic that removes /sbin Closes: https://bugs.gentoo.org/659042 Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247 sys-apps/systemd/systemd-239.ebuild | 5 ++++- sys-apps/systemd/systemd-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-apps/systemd/systemd-239.ebuild b/sys-apps/systemd/systemd-239.ebuild index 779db468b79..08a0c54c349 100644 --- a/sys-apps/systemd/systemd-239.ebuild +++ b/sys-apps/systemd/systemd-239.ebuild @@ -312,11 +312,14 @@ multilib_src_install_all() { if ! use sysv-utils; then rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rmdir "${ED%/}${rootprefix}"/sbin || die rm "${ED%/}"/usr/share/man/man1/init.1 || die rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die fi + if ! use resolvconf && ! use sysv-utils; then + rmdir "${ED%/}${rootprefix}"/sbin || die + fi + # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 779db468b79..08a0c54c349 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -312,11 +312,14 @@ multilib_src_install_all() { if ! use sysv-utils; then rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die - rmdir "${ED%/}${rootprefix}"/sbin || die rm "${ED%/}"/usr/share/man/man1/init.1 || die rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die fi + if ! use resolvconf && ! use sysv-utils; then + rmdir "${ED%/}${rootprefix}"/sbin || die + fi + # Preserve empty dirs in /etc & /var, bug #437008 keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd