]> git.ipfire.org Git - thirdparty/dracut-ng.git/commitdiff
fix(dracut): move defining DRACUT_LDCONFIG to dracut-functions.sh
authorBenjamin Drung <benjamin.drung@canonical.com>
Mon, 26 Jan 2026 16:35:55 +0000 (17:35 +0100)
committerNeal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
Mon, 26 Jan 2026 20:26:52 +0000 (15:26 -0500)
The function `ldconfig_paths` in `dracut-functions.sh` uses
`DRACUT_LDCONFIG`. Therefore move defining `DRACUT_LDCONFIG` into
`dracut-functions.sh`.

dracut-functions.sh
dracut.sh

index f81ae3fc39b334d6aa6feb57a07714ab548e568a..d04718db2b6cf2e43578a49c269f7aa22a4064e3 100755 (executable)
@@ -1514,6 +1514,8 @@ if ! is_func dinfo > /dev/null 2>&1; then
     dlog_init
 fi
 
+DRACUT_LDCONFIG=${DRACUT_LDCONFIG:-ldconfig}
+
 if ! [[ "${DRACUT_INSTALL-}" ]]; then
     DRACUT_INSTALL=$(find_binary dracut-install || true)
 fi
index 531a670bae8ce9b8e781a9baff6afd0719336751..d99a953406496f9803592e0e1cbd1c7595582e91 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -1472,7 +1472,6 @@ export srcmods
 }
 
 DRACUT_TESTBIN=${DRACUT_TESTBIN:-/bin/sh}
-DRACUT_LDCONFIG=${DRACUT_LDCONFIG:-ldconfig}
 PKG_CONFIG=${PKG_CONFIG:-pkg-config}
 
 # Detect lib paths