From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4AFBF139694 for ; Thu, 27 Apr 2017 16:36:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 684FA21C08B; Thu, 27 Apr 2017 16:36:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FB1C21C08B for ; Thu, 27 Apr 2017 16:36:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2A3B3416C7 for ; Thu, 27 Apr 2017 16:36:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 325B87435 for ; Thu, 27 Apr 2017 16:36:23 +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: <1493310981.cda7cf95b9113c2054abd52069d24ae7259d7187.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: cda7cf95b9113c2054abd52069d24ae7259d7187 X-VCS-Branch: master Date: Thu, 27 Apr 2017 16:36:23 +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: c8b5af47-f61b-4a6e-9f72-f5f9a9e3db5d X-Archives-Hash: 92e97e329f04973819f644f41cfc40d0 commit: cda7cf95b9113c2054abd52069d24ae7259d7187 Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 27 16:33:52 2017 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 27 16:36:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda7cf95 sys-apps/systemd: add symlinks to ease rootprefix migration systemd holds the path to systemd and systemd-shutdown in memory. The symlinks ensure that re-exec and reboot will work. Also, the bootloader init option will not need to be updated immediately. Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 sys-apps/systemd/systemd-9999.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 55c4ac98da3..8ab713955c8 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -203,7 +203,7 @@ multilib_src_configure() { -Dbashcompletiondir="$(get_bashcompdir)" # make sure we get /bin:/sbin in $PATH -Dsplit-usr=true - -Drootprefix="${ROOTPREFIX}" + -Drootprefix="${EPREFIX}${ROOTPREFIX}" -Dsysvinit-path= -Dsysvrcnd-path= # no deps @@ -326,6 +326,12 @@ multilib_src_install_all() { rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die + + if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then + # Avoid breaking boot/reboot + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown + fi } migrate_locale() {