diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-06-25 17:14:22 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2018-06-25 17:14:37 -0400 |
| commit | 840aa1653307566107f0ef2f50f894d2a863891e (patch) | |
| tree | 5916a89f948be9c85384fd6381621b6c17e915c1 /sys-apps/systemd | |
| parent | dev-libs/libtsm: new package needed for kmscon (diff) | |
| download | gentoo-840aa1653307566107f0ef2f50f894d2a863891e.tar.gz gentoo-840aa1653307566107f0ef2f50f894d2a863891e.tar.bz2 gentoo-840aa1653307566107f0ef2f50f894d2a863891e.zip | |
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
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/systemd-239.ebuild | 5 | ||||
| -rw-r--r-- | 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 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 |