[arch-projects] [mkinitcpio][PATCH 3/5] functions: fix pathing issue with $BASEDIR

Dave Reisner d at falconindy.com
Sun Jun 26 20:32:14 EDT 2011


Thanks-to: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
 functions |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/functions b/functions
index 54442c8..9c095bc 100644
--- a/functions
+++ b/functions
@@ -182,7 +182,7 @@ add_module() {
         # get module firmware
         while read -r -d '' fw; do
             if [[ -e "$BASEDIR/lib/firmware/$fw" ]]; then
-                add_file "$BASEDIR/lib/firmware/$fw"
+                add_file "/lib/firmware/$fw"
             fi
         done < <(kmodinfo -0F firmware "$module")
 
@@ -193,7 +193,7 @@ add_module() {
         done
 
         ADDED_MODULES+=("${module//-/_}")
-        add_file "$path" || return
+        add_file "${path#$BASEDIR}" || return
     else
         error "module '$module' not found"
         return 1
@@ -265,7 +265,7 @@ add_binary() {
     mode=$(stat -c %a "$binary")
 
     # always add the binary itself
-    _add_file "${dest#$BASEDIR}" "${binary#$BASEDIR}" "$mode"
+    _add_file "${dest#$BASEDIR}" "$binary" "$mode"
 
     $LD_SO --verify "$binary" &>/dev/null || return # not a binary!
 
-- 
1.7.5.4



More information about the arch-projects mailing list