From cda7cf95b9113c2054abd52069d24ae7259d7187 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Thu, 27 Apr 2017 12:33:52 -0400 Subject: [PATCH] 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 55c4ac98da38..8ab713955c87 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() { -- 2.26.2