| 1 |
commit: cda7cf95b9113c2054abd52069d24ae7259d7187 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 27 16:33:52 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 27 16:36:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cda7cf95 |
| 7 |
|
| 8 |
sys-apps/systemd: add symlinks to ease rootprefix migration |
| 9 |
|
| 10 |
systemd holds the path to systemd and systemd-shutdown in memory. |
| 11 |
The symlinks ensure that re-exec and reboot will work. |
| 12 |
Also, the bootloader init option will not need to be updated immediately. |
| 13 |
|
| 14 |
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 |
| 15 |
|
| 16 |
sys-apps/systemd/systemd-9999.ebuild | 8 +++++++- |
| 17 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 20 |
index 55c4ac98da3..8ab713955c8 100644 |
| 21 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 22 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 23 |
@@ -203,7 +203,7 @@ multilib_src_configure() { |
| 24 |
-Dbashcompletiondir="$(get_bashcompdir)" |
| 25 |
# make sure we get /bin:/sbin in $PATH |
| 26 |
-Dsplit-usr=true |
| 27 |
- -Drootprefix="${ROOTPREFIX}" |
| 28 |
+ -Drootprefix="${EPREFIX}${ROOTPREFIX}" |
| 29 |
-Dsysvinit-path= |
| 30 |
-Dsysvrcnd-path= |
| 31 |
# no deps |
| 32 |
@@ -326,6 +326,12 @@ multilib_src_install_all() { |
| 33 |
rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die |
| 34 |
|
| 35 |
rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die |
| 36 |
+ |
| 37 |
+ if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then |
| 38 |
+ # Avoid breaking boot/reboot |
| 39 |
+ dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd |
| 40 |
+ dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown |
| 41 |
+ fi |
| 42 |
} |
| 43 |
|
| 44 |
migrate_locale() { |
Archives