Browse Source

inst_dir: fix handling of relative symlinks outside the current dir

inst_dir used the following to try to resolve a relative path:
  [[ $target = ${target##*/} ]] && target="${file%/*}/$target"
  inst_dir $target

This will only match if $target has no slashes, so something like
/usr/bin -> ../sbin would result in: inst_dir ../sbin, or
/usr/share -> local/share would result in: inst_dir local/share
which is not going to do the right thing.

Instead, we resolve any non-absolute link, like so:
  [[ $target == ${target#/} ]] && target=$(dirname "$file")/$target
Thus /usr/bin -> ../sbin results in: inst_dir /usr/../sbin, and
/usr/share -> local/share results in: inst_dir /usr/local/share
which is what you would expect.
master
Will Woods 14 years ago committed by Harald Hoyer
parent
commit
fe9cdf741f
  1. 4
      dracut-functions

4
dracut-functions

@ -240,8 +240,8 @@ inst_dir() { @@ -240,8 +240,8 @@ inst_dir() {
# create link as the original
local target=$(readlink "$file")
ln -sfn "$target" "${initdir}$file" || return 1
# resolve relative path and recursively install destionation
[[ $target = ${target##*/} ]] && target="${file%/*}/$target"
# resolve relative path and recursively install destination
[[ $target == ${target#/} ]] && target=$(dirname "$file")/$target
inst_dir "$target"
else
# create directory

Loading…
Cancel
Save