From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 543971384B4 for ; Sun, 13 Dec 2015 16:49:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A66D21C036; Sun, 13 Dec 2015 16:49:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF62521C036 for ; Sun, 13 Dec 2015 16:49:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91013340997 for ; Sun, 13 Dec 2015 16:49:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD667A0E for ; Sun, 13 Dec 2015 16:49:29 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1450025250.3c2977ec991958d3fbae585e96f7eba14fa91c20.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 3c2977ec991958d3fbae585e96f7eba14fa91c20 X-VCS-Branch: master Date: Sun, 13 Dec 2015 16:49:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5183fecc-49a4-4969-ae47-f2d215f7e6d7 X-Archives-Hash: 4c9dfb1b5085ab48e22bfeaeaa775ca7 commit: 3c2977ec991958d3fbae585e96f7eba14fa91c20 Author: Mike Gilbert gentoo org> AuthorDate: Sun Dec 13 16:44:54 2015 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Dec 13 16:47:30 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2977ec sys-apps/systemd: Fix install when resolved is disabled Bug: https://bugs.gentoo.org/568170 Package-Manager: portage-2.2.26_p27 sys-apps/systemd/systemd-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 440c35f..7fa9af7 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