summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-12-05 10:10:45 -0800
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-18 22:09:17 -0600
commit88ae858f514755992cebf5e13811d54f7a19309a (patch)
tree2c08d5b31caca32ebe43d915eb4f062b86d19466
parent09435a26521027b98fbdf3ff945a16f5621a45eb (diff)
Support mutli-arch disks by specifying the arch
Specify the arch on the command line and mountpoints so that we can support mutli-arch livecds Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--archiso/hooks/archiso8
1 files changed, 7 insertions, 1 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index e6ccfd4..60e14bf 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -27,6 +27,10 @@ _mnt_squashfs()
run_hook ()
{
+ if [ "x${arch}" = "x" ]; then
+ arch="$(uname -m)"
+ fi
+
if [ "x${ramdisk_size}" = "x" ]; then
ramdisk_size="75%"
fi
@@ -100,10 +104,12 @@ run_hook ()
export LOOP_NUM="0"
if [ -e "/mounts" ]; then
msg ":: Mounting images"
- while read img mountpoint type; do
+ while read img imgarch mountpoint type; do
# check if this line is a comment (starts with #)
[ "${img#"#"}" != "${img}" ] && continue
+ [ "$imgarch" != "$arch" ] && continue
+
if [ "${type}" = "bind" ]; then
_mnt_bind ${img} ${mountpoint}
elif [ "${type}" = "squashfs" ]; then