From f09aff2cec29806356b800e1c13b711668b1fc26 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 26 Jun 2011 20:10:41 -0400 Subject: mkinitcpio: fix resolution issues with RTLD The _add_dir call is all wrong. The necessary paths are created by reversing the order of the _add_symlink and _add_file calls, as _add_file will take care of creating parent directories. Thanks-to: Gerardo Exequiel Pozzi Signed-off-by: Dave Reisner --- mkinitcpio | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mkinitcpio b/mkinitcpio index 5389aca..459c828 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -306,9 +306,8 @@ if (( ${#LD_SO[*]} != 1 )); then # uh oh... fi resolved=$(readlink -e "$LD_SO") -_add_dir "${resolved%/*}" 755 -_add_symlink "${LD_SO#$BASEDIR}" "${resolved#$BASEDIR}" -_add_file "${resolved#$BASEDIR}" "${resolved#$BASEDIR}" 755 +_add_file "${resolved#$BASEDIR}" "$resolved" 755 +_add_symlink "${LD_SO#$BASEDIR}" "$resolved" unset resolved for hook in ${HOOKS}; do -- cgit v1.2.3-24-g4f1b