From 3a1fc5911c3f760ac92d49440f96a04470e457f6 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 5 Dec 2008 10:10:45 -0800 Subject: 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 --- archiso/hooks/archiso | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'archiso/hooks') 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 -- cgit v1.2.3-70-g09d2