From: Harald Hoyer Date: Fri, 5 Mar 2010 10:14:28 +0000 (+0100) Subject: dracut: move ldconfig after include X-Git-Tag: 005~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdc421dbacc92e2a5286df203b2d29b6e870552a;p=thirdparty%2Fdracut-ng.git dracut: move ldconfig after include --- diff --git a/dracut b/dracut index 91098c489..b16e20515 100755 --- a/dracut +++ b/dracut @@ -258,10 +258,6 @@ if [[ -d $initdir/lib/modules/$kernel ]]; then fi fi -# make sure that library links are correct and up to date -cp -ar /etc/ld.so.conf* "$initdir"/etc -ldconfig -r "$initdir" || [[ $(id -u) != "0" ]] && dinfo "ldconfig might need uid=0 (root) for chroot()" - if [[ $include_src && $include_target ]]; then mkdir -p "$initdir$include_target" cp -a -t "$initdir$include_target" "$include_src"/* @@ -272,6 +268,10 @@ for item in $install_items; do done unset item +# make sure that library links are correct and up to date +cp -ar /etc/ld.so.conf* "$initdir"/etc +ldconfig -r "$initdir" || [[ $(id -u) != "0" ]] && dinfo "ldconfig might need uid=0 (root) for chroot()" + [[ $beverbose = yes ]] && (du -c "$initdir" | sort -n) # strip binaries