From: Seewer Philippe <philippe.seewer-omB+W0Dpw2o@public.gmane.org>
Date: Fri, 27 Feb 2009 14:37:47 +0000 (+0100)
Subject: Canonicalize symlinks
X-Git-Tag: 0.1~401
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f88fcd94b658096c351f622b1813fb78980f005;p=thirdparty%2Fdracut.git

Canonicalize symlinks

When handling links sometimes one readlink isn't enough. Dracut doesn't
need to clone a whole link series, so just use readlink -f

--
  dracut-functions |    8 +++-----
  1 files changed, 3 insertions(+), 5 deletions(-)
---

diff --git a/dracut-functions b/dracut-functions
index cd1af8e11..f9a600daa 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -42,11 +42,9 @@ inst_library() {
     local src=$1 dest=${2:-$1}
     [[ -f $initdir$dest ]] && return 0
     if [[ -L $src ]]; then
-	reallib="$(readlink "$src")"
+	reallib="$(readlink -f "$src")"
 	lib=${src##*/}
-	realsrc="${src%/*}/$reallib"
-	realdest="${dest%/*}/$reallib"
-	inst_simple "$realsrc" "$realdest"
+	inst_simple "$reallib" "$reallib"
 	(cd "${initdir}${dest%/*}" && ln -s "$reallib" "$lib")
     else
 	inst_simple "$src" "$dest"
@@ -125,7 +123,7 @@ inst_symlink() {
     local src=$1 target=$initdir${2:-$1} realsrc
     [[ -L $1 ]] || return 1
     [[ -L $target ]] && return 0
-    realsrc=$(readlink "$src")
+    realsrc=$(readlink -f "$src")
     [[ $realsrc = ${realsrc##*/} ]] && realsrc="${src%/*}/$realsrc"
     inst "$realsrc" && ln -s "$realsrc" "$target"
 }