summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Leone <simo@archlinux.org>2007-10-24 20:17:24 -0500
committerSimo Leone <simo@archlinux.org>2007-10-24 20:17:24 -0500
commitadbe44f229c1ad23a9af86c4dca379b103ccb5ca (patch)
tree55f388120dd5129a7105ad5c17af9903e3f23118
parent9729512abda1e0ae04290f2a67aa7ac8bc411126 (diff)
downloadarchiso32-adbe44f229c1ad23a9af86c4dca379b103ccb5ca.tar.xz
Make _mnt_squashfs more generic
No longer assume the image is in the addons directory. Signed-off-by: Simo Leone <simo@archlinux.org>
-rw-r--r--hooks/archiso6
1 files changed, 3 insertions, 3 deletions
diff --git a/hooks/archiso b/hooks/archiso
index 84c2241..c09d7bd 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -11,7 +11,7 @@ _mnt_squashfs()
{
msg "::: Adding new union branch: ${1}"
mkdir -p "/tmpfs/mnt/loop${LOOP_NUM}"
- if ! /bin/losetup "/dev/loop${LOOP_NUM}" ${addon_dir}/${1} > /dev/null 2>&1; then
+ if ! /bin/losetup "/dev/loop${LOOP_NUM}" ${1} > /dev/null 2>&1; then
echo "ERROR: Cannot mount loop device /dev/loop${LOOP_NUM}"
echo " Couldn't mount all addons"
break
@@ -60,7 +60,7 @@ run_hook ()
addon_dir="${BOOT_MOUNT}/addons"
# always layer default configuration
- _mnt_squashfs "default-config.sqfs"
+ _mnt_squashfs "${addon_dir}/default-config.sqfs"
if [ -e "${addon_dir}/config" ]; then
msg ":: Mounting addons"
@@ -71,7 +71,7 @@ run_hook ()
if [ "${type}" = "bind" ]; then
_mnt_bind ${img} ${mountpoint}
elif [ "${type}" = "squashfs" ]; then
- _mnt_squashfs ${img}
+ _mnt_squashfs "${addon_dir}/${img}"
fi
done < ${addon_dir}/config
fi