fix(01systemd-ldconfig): install ldconfig.real

Also restore enablement of ldconfig.service in TEST-04-FULL-SYSTEMD.

diff --git a/modules.d/01systemd-ldconfig/module-setup.sh b/modules.d/01systemd-ldconfig/module-setup.sh
index 3a5842a6a034cfc490851c06798c5dc2b91c9287..4e65d89211ec092079ab5d23d7f859d66c64c1a3 100755 (executable)
--- a/modules.d/01systemd-ldconfig/module-setup.sh
+++ b/modules.d/01systemd-ldconfig/module-setup.sh
@@ -33,7 +33,8 @@ install() {
         "$systemdsystemunitdir"/ldconfig.service \
         "$systemdsystemunitdir/ldconfig.service.d/*.conf" \
         "$systemdsystemunitdir"/sysinit.target.wants/ldconfig.service \
-        ldconfig
+        ldconfig \
+        ldconfig.real
 
     # Install required libraries.
     _arch=${DRACUT_ARCH:-$(uname -m)}

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index ce35721257a9234cff432946a10dc870e407c3f2..afd76457f35981d0d0a939d1e27dcf762efab94a 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -52,7 +52,7 @@ test_setup() {
 
     # Create what will eventually be our root filesystem onto an overlay
     "$DRACUT" -N -l --keep --tmpdir "$TESTDIR" \
-        -m "test-root systemd" \
+        -m "test-root systemd-ldconfig" \
         -i "${PKGLIBDIR}/modules.d/80test-root/test-init.sh" "/sbin/test-init.sh" \
         -i ./test-init.sh /sbin/test-init \
         -I "findmnt" \
@@ -77,9 +77,6 @@ test_setup() {
     # softlink mtab
     ln -fs /proc/self/mounts "$initdir"/etc/mtab
 
-    # Do not need ldconfig.service in our rootfs
-    rm -rf "$initdir"/usr/lib/systemd/system/sysinit.target.wants/ldconfig.service
-
     # install any Execs from the service files
     grep -Eho '^Exec[^ ]*=[^ ]+' "$initdir"{,/usr}/lib/systemd/system/*.service \
         | while read -r i || [ -n "$i" ]; do