summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/initramfs/scripts/etc/functions3
-rwxr-xr-xsrc/initramfs/scripts/init2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/initramfs/scripts/etc/functions b/src/initramfs/scripts/etc/functions
index 066d2756..717a9c10 100644
--- a/src/initramfs/scripts/etc/functions
+++ b/src/initramfs/scripts/etc/functions
@@ -518,7 +518,8 @@ return 0
# check that /mnt/etc/ld.so.conf is never lost
ldconfig () {
local cachefile="$1"
-for ldcfg in /mnt/sbin/ldconfig \
+for ldcfg in /mnt/sbin/ldconfig.real \
+ /mnt/sbin/ldconfig \
/mnt/bin/ldconfig \
/mnt/usr/sbin/ldconfig; do
test -x $ldcfg && {
diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index 2355c9f0..7f92067b 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -221,6 +221,8 @@ in $0\ncountry=\"${COUNTRY}\"" >>/etc/initramfs-setup
# most probably it is a good idea to run ldconfig, so enable it
ldsc="yes"
;;
+ noldsc)
+ ldsc="";;
# same for AUFS; alternative to unionfs
noaufs)
aufs=0;;