From 840aa1653307566107f0ef2f50f894d2a863891e Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 25 Jun 2018 17:14:22 -0400 Subject: 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(-) (limited to 'sys-apps/systemd') diff --git a/sys-apps/systemd/systemd-239.ebuild b/sys-apps/systemd/systemd-239.ebuild index 779db468b79b..08a0c54c349b 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 779db468b79b..08a0c54c349b 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 -- cgit v1.2.3-65-gdbad