Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso/hooks
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
commit3a1fc5911c3f760ac92d49440f96a04470e457f6 (patch)
tree5aab6402849f43e6111c71def7ebb0bf6ea6ddf4 /archiso/hooks
parentd51b780fe4e6a3aad9cdb86534ed41f984d23f16 (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>
Diffstat (limited to 'archiso/hooks')
-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