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

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

diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
index 697bda043aac15e261ca7edf2333a9921909aeee..d735dd02ab98de0568e00bd715eca037370434bc 100644 (file)
--- 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() {