summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-10-20 23:39:43 -0500
committerAaron Griffin <aaronmgriffin@gmail.com>2008-10-20 23:39:43 -0500
commit3f5c116d8c916cb7cef1791e8fd8930aae118119 (patch)
treef5ce7ee33b314c09e93226969d304a1556702267 /archiso
parent2b6515271d76823386fbe1396187a8463fb454c3 (diff)
downloadarchiso32-3f5c116d8c916cb7cef1791e8fd8930aae118119.tar.xz
Enable mkinitcpio hook to use the 'mounts' file
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'archiso')
-rw-r--r--archiso/hooks/archiso18
-rwxr-xr-xarchiso/mkarchiso1
2 files changed, 7 insertions, 12 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index b614afd..7168aff 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -3,7 +3,7 @@ _mnt_bind()
{
msg "::: Binding ${1} to ${2}"
mkdir -p /real_root${2}
- /bin/mount -o bind ${addon_dir}/${1} /real_root${2}
+ /bin/mount -o bind ${1} /real_root${2}
}
# args: image file
@@ -14,7 +14,6 @@ _mnt_squashfs()
mkdir -p "/tmpfs/mnt/loop${LOOP_NUM}"
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
fi
/bin/mount -r -t squashfs "/dev/loop${LOOP_NUM}" "/tmpfs/mnt/loop${LOOP_NUM}"
@@ -95,13 +94,8 @@ run_hook ()
/bin/mount -t unionfs -o dirs=/tmpfs=rw none /real_root
export LOOP_NUM="0"
- addon_dir="${bootmnt}/addons"
-
- # always layer default configuration
- _mnt_squashfs "${addon_dir}/overlay.sqfs"
-
- if [ -e "${addon_dir}/config" ]; then
- msg ":: Mounting addons"
+ if [ -e "/mounts" ]; then
+ msg ":: Mounting images"
while read img mountpoint type; do
# check if this line is a comment (starts with #)
[ "${img#"#"}" != "${img}" ] && continue
@@ -109,9 +103,11 @@ run_hook ()
if [ "${type}" = "bind" ]; then
_mnt_bind ${img} ${mountpoint}
elif [ "${type}" = "squashfs" ]; then
- _mnt_squashfs "${addon_dir}/${img}"
+ _mnt_squashfs "${img}"
fi
- done < ${addon_dir}/config
+ done < /mounts
+ else
+ msg ":: No mountable images found"
fi
# layer the "pristine" base system image last
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e8babac..133d57d 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -61,7 +61,6 @@ esac
echo "${APPNAME} : Configuration Settings"
-echo " mount description file: ${MOUNTFILE}"
echo " working directory: ${work_dir}"
echo " image name: ${imgname}"
echo " image type: ${IMG_TYPE}"