[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/

[Mike Gilbert]

commit:     6de415c71946be5f07484e8974297643b93da5b6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 14:00:00 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 14:01:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de415c7

sys-apps/systemd-utils: create /lib/{systemd,udev} symlinks in preinst

This should avoid any file collsion checking.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd-utils/systemd-utils-255.7.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild 
b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
index 767e5a8b7ec6..f34f50b1db52 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
@@ -558,11 +558,6 @@ multilib_src_install_all() {
 
        use ukify && python_fix_shebang "${ED}"
        use boot && secureboot_auto_sign
-
-       if use split-usr; then
-               dosym ../usr/lib/systemd /lib/systemd
-               dosym ../usr/lib/udev /lib/udev
-       fi
 }
 
 add_service() {
@@ -577,8 +572,9 @@ add_service() {
 
 pkg_preinst() {
        # Migrate /lib/{systemd,udev} to /usr/lib
-       # Symlinks will be installed in the merge phase
        if use split-usr; then
+               dosym ../usr/lib/systemd /lib/systemd
+               dosym ../usr/lib/udev /lib/udev
                local d
                for d in systemd udev; do
                        if [[ -e ${EROOT}/lib/${d} && ! -L ${EROOT}/lib/${d} 
]]; then