diff options
| author | Sebastian Schmelzer | 2011-02-28 21:33:19 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-02-28 21:33:19 +0100 |
| commit | ed5b0181e4feccd2420764526c5ee8d842a05f93 (patch) | |
| tree | eb915cf6580513226a69e4d97ae92030a84f48f8 /src | |
| parent | tune tmpfs/ramzswap (diff) | |
| download | core-ed5b0181e4feccd2420764526c5ee8d842a05f93.tar.gz core-ed5b0181e4feccd2420764526c5ee8d842a05f93.tar.xz core-ed5b0181e4feccd2420764526c5ee8d842a05f93.zip | |
transfer fixes from 4.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/initramfs/scripts/etc/functions | 3 | ||||
| -rwxr-xr-x | src/initramfs/scripts/init | 2 |
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;; |