From: Will Woods <wwoods@redhat.com>
Date: Tue, 8 Mar 2011 23:35:12 +0000 (-0500)
Subject: inst_dir: fix handling of relative symlinks outside the current dir
X-Git-Tag: 009~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe9cdf741f813867b3c0f0172299157c6f2a5847;p=thirdparty%2Fdracut.git

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.
---

diff --git a/dracut-functions b/dracut-functions
index 594cc0e28..e321dc98e 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -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