From adbe44f229c1ad23a9af86c4dca379b103ccb5ca Mon Sep 17 00:00:00 2001
From: Simo Leone <simo@archlinux.org>
Date: Wed, 24 Oct 2007 20:17:24 -0500
Subject: Make _mnt_squashfs more generic

No longer assume the image is in the addons
directory.

Signed-off-by: Simo Leone <simo@archlinux.org>
---
 hooks/archiso | 6 +++---
 1 file 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
-- 
cgit v1.2.2