Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Sun, 13 Dec 2015 16:49:38
Message-Id: 1450025250.3c2977ec991958d3fbae585e96f7eba14fa91c20.floppym@gentoo
1 commit: 3c2977ec991958d3fbae585e96f7eba14fa91c20
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 13 16:44:54 2015 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 13 16:47:30 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2977ec
7
8 sys-apps/systemd: Fix install when resolved is disabled
9
10 Bug: https://bugs.gentoo.org/568170
11
12 Package-Manager: portage-2.2.26_p27
13
14 sys-apps/systemd/systemd-9999.ebuild | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
18 index 440c35f..7fa9af7 100644
19 --- a/sys-apps/systemd/systemd-9999.ebuild
20 +++ b/sys-apps/systemd/systemd-9999.ebuild
21 @@ -329,7 +329,7 @@ multilib_src_install_all() {
22 # If we install these symlinks, there is no way for the sysadmin to remove them
23 # permanently.
24 rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
25 - rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
26 + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
27 rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
28 rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
29 rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die