From: Mike Gilbert Date: Sun, 13 Dec 2015 16:44:54 +0000 (-0500) Subject: sys-apps/systemd: Fix install when resolved is disabled X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3c2977ec991958d3fbae585e96f7eba14fa91c20;p=gentoo.git sys-apps/systemd: Fix install when resolved is disabled Bug: https://bugs.gentoo.org/568170 Package-Manager: portage-2.2.26_p27 --- diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 440c35f86df0..7fa9af77d18d 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -329,7 +329,7 @@ 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 "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.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