summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-06-27 01:28:18 +0200
committerDave Reisner <dreisner@archlinux.org>2011-06-27 02:21:53 +0200
commit84f474bfc3ceedf9d34bde1df75734fcfcdca239 (patch)
tree81da9618684dea98e92fbc5f75784df63f6fb1a4
parentf00e41b98d2d3a89e36763a4c613d16bbe6e216c (diff)
downloadmkinitcpio-84f474bfc3ceedf9d34bde1df75734fcfcdca239.tar.gz
mkinitcpio-84f474bfc3ceedf9d34bde1df75734fcfcdca239.tar.xz
functions: fix pathing issue with $BASEDIR
Thanks-to: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--functions6
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!