diff options
author | Thomas Bächler <thomas@archlinux.org> | 2011-06-27 10:18:41 +0200 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2011-06-27 10:18:41 +0200 |
commit | a5eb24e544576b23e842874f510c2a7811e95ea3 (patch) | |
tree | 6aa89315786f91eb86292a95ae1c1408027b0a4a /mkinitcpio | |
parent | ec8151237b99dc28a6efd155c571d9204cb436c5 (diff) | |
parent | f09aff2cec29806356b800e1c13b711668b1fc26 (diff) | |
download | mkinitcpio-a5eb24e544576b23e842874f510c2a7811e95ea3.tar.gz mkinitcpio-a5eb24e544576b23e842874f510c2a7811e95ea3.tar.xz |
Merge branch 'working'
Diffstat (limited to 'mkinitcpio')
-rwxr-xr-x | mkinitcpio | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -209,7 +209,7 @@ if [[ $PRESET ]]; then preset_config=${p}_config if [[ ${!preset_config:-$ALL_config} ]]; then - preset_cmd+=(-c "${!preset_config:-$ALL_config}") + preset_cmd+=(-c "$BASEDIR${!preset_config:-$ALL_config}") else warning "No configuration file specified. Skipping image '%s'" "$p" continue @@ -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 |