summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-04-26 00:28:34 +0200
committerAaron Griffin <aaron@archlinux.org>2006-04-26 00:28:34 +0200
commitfb6331d8c177e608cf164fbebfb7f559f5ef067d (patch)
tree336147adbf5211f407f49712248d035e3752035b
parent0958c0bcbad1a9db223225b9e69247e6b9c7a80c (diff)
downloadmkinitcpio-fb6331d8c177e608cf164fbebfb7f559f5ef067d.tar.gz
mkinitcpio-fb6331d8c177e608cf164fbebfb7f559f5ef067d.tar.xz
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@17 880c04e9-e011-0410-abf7-b926e227c9cd
-rw-r--r--functions4
-rw-r--r--init2
-rw-r--r--mkinitcpio2
3 files changed, 4 insertions, 4 deletions
diff --git a/functions b/functions
index 7a02c6e..6b35d77 100644
--- a/functions
+++ b/functions
@@ -53,7 +53,7 @@ add_symlink ()
if [ -L ${1} ]; then
fil="${1}"
dest="${fil##$BASEDIR}"
- add_dir "${dest}"
+ add_dir $(dirname "${dest}")
if ! grep "slink ${fil} " "${FILELIST}" 2>&1 > /dev/null; then
msg " adding symlink ${dest}"
echo "slink ${dest} ${fil} $(stat -c '%a %u %g' ${fil})" >> "${FILELIST}"
@@ -78,7 +78,7 @@ add_file ()
dest="${fil##$BASEDIR}"
fi
- add_dir "${dest}"
+ add_dir $(dirname "${dest}")
if ! grep "file ${fil} " "${FILELIST}" 2>&1 > /dev/null; then
msg " adding file ${dest}"
diff --git a/init b/init
index 4508f01..a8f7b34 100644
--- a/init
+++ b/init
@@ -39,7 +39,7 @@ if [ -e "/hooks" ]; then
if [ "${TST}" != "disabled" ]; then
run_hook () { msg "$h: no run function defined"; }
if [ -e "/hooks/$h" ]; then
- . $h
+ . /hooks/$h
msg ":: Running Hook [${h}]"
run_hook
fi
diff --git a/mkinitcpio b/mkinitcpio
index 0056ec7..0ddf4a4 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -105,7 +105,7 @@ for hook in $HOOKS; do
unset BINARIES
unset FILES
install () { msg "${hook}: no install function..."; }
- if grep "install" "${INSTDIR}/${hook}" /dev/null 2>&1; then
+ if grep "install" "${INSTDIR}/${hook}" >/dev/null 2>&1; then
source "${INSTDIR}/${hook}"
install
parse_hook