[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     95b3550d281854b73c882dcb63d55b87fe2b016f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 14:31:24 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 14:31:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b3550d

sys-apps/systemd: update /etc/systemd/system symlink removal

Package-Manager: Portage-2.3.19_p2, Repoman-2.3.6_p36

 sys-apps/systemd/systemd-233-r6.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys-apps/systemd/systemd-233-r6.ebuild 
b/sys-apps/systemd/systemd-233-r6.ebuild
index 697bda043aa..d735dd02ab9 100644
--- a/sys-apps/systemd/systemd-233-r6.ebuild
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -356,11 +356,13 @@ multilib_src_install_all() {
 
        # If we install these symlinks, there is no way for the sysadmin to 
remove them
        # permanently.
-       rm 
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || 
die
-       rm -f 
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || 
die
-       rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
-       rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
-       rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+       rm -f 
"${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service 
|| die
+       rm -f 
"${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+       rm -f 
"${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service 
|| die
+       rm -f 
"${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+       rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+       rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+       rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
 }
 
 migrate_locale() {