kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 2011-03-08 18:35:12 -05:00 committed by Harald Hoyer
parent 3d88d27810
commit fe9cdf741f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dracut-functions
View File

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